ronin-support 0.1.0.rc1 → 0.1.0.rc2

data/Gemfile

@@ -1,5 +1,3 @@
-require 'ore/specification'
-
 source 'https://rubygems.org'
 
 gemspec
@@ -11,9 +9,14 @@ end
 group :development do
   gem 'rake',		        '~> 0.8.7'
 
-  gem 'ore-core',       '~> 0.1.1'
-  gem 'ore-tasks',	    '~> 0.3.0'
-  gem 'rspec',          '~> 2.3.0'
+  gem 'ore-tasks',	    '~> 0.4'
+  gem 'rspec',          '~> 2.4'
+
+  gem 'kramdown',       '~> 0.12'
+end
 
-  gem 'kramdown',       '~> 0.12.0'
+group :test do
+  gem 'i18n',           '~> 0.4'
+  gem 'tzinfo',         '~> 0.3.0'
+  gem 'activesupport',  '~> 3.0.0'
 end

data/gemspec.yml

@@ -10,13 +10,14 @@ email: postmodern.mod3@gmail.com
 homepage: http://github.com/ronin-ruby/ronin-support
 has_yard: true
 
-required_ruby_version: >= 1.8.7
+required_ruby_version: ">= 1.8.7"
 
 dependencies:
-  chars: ~> 0.2.0
-  uri-query_params: ~> 0.5.2
-  data_paths: ~> 0.2.1
+  chars: ~> 0.2
+  combinatorics: ~> 0.3
+  uri-query_params: ~> 0.5, >= 0.5.2
+  data_paths: ~> 0.2, >= 0.2.1
 
 development_dependencies:
-  bundler: ~> 1.0.0
+  bundler: ~> 1.0.10
   yard: ~> 0.6.4

data/lib/ronin/extensions/ip_addr.rb

@@ -20,6 +20,7 @@
 require 'ipaddr'
 require 'resolv'
 require 'strscan'
+require 'combinatorics/list_comprehension'
 
 class IPAddr
 
@@ -135,38 +136,29 @@ class IPAddr
     end
 
     # split the address
-    ranges = cidr_or_glob.split(separator)
+    segments = cidr_or_glob.split(separator)
+    ranges = []
     
     # map the components of the address to numeric ranges
-    ranges.map! do |segment|
-      if segment == '*'
-        (1..254)
-      elsif segment.include?('-')
-        start, stop = segment.split('-',2).map { |i| i.to_i(base) }
-
-        (start..stop)
-      elsif !(segment.empty?)
-        segment.to_i(base)
-      end
+    segments.each do |segment|
+      next if segment.empty?
+
+      ranges << if segment == '*'
+                  (1..254)
+                elsif segment.include?('-')
+                  start, stop = segment.split('-',2)
+
+                  (start.to_i(base)..stop.to_i(base))
+                else
+                  segment.to_i(base)
+                end
     end
-    ranges.compact!
-
-    expand_range = lambda { |address,remaining|
-      if remaining.empty?
-        block.call(format.call(address))
-      else
-        n = remaining.first
-        remaining = remaining[1..-1]
-
-        if n.kind_of?(Range)
-          n.each { |i| expand_range.call(address + [i], remaining) }
-        else
-          expand_range.call(address + [n], remaining)
-        end
-      end
-    }
-
-    expand_range.call([], ranges)
+
+    # cycle through the address ranges
+    ranges.comprehension do |address|
+      yield format[address]
+    end
+
     return nil
   end
 

data/lib/ronin/network/http/http.rb

@@ -182,7 +182,10 @@ module Ronin
       #   The camel-case HTTP header name.
       #
       def HTTP.header_name(name)
-        name.to_s.split(/[\s+_-]/).map { |word| word.capitalize }.join('-')
+        words = name.to_s.split(/[\s+_-]/)
+
+        words.each { |word| word.capitalize! }
+        return words.join('-')
       end
 
       #

data/lib/ronin/path.rb

@@ -70,7 +70,8 @@ module Ronin
     #   #<Ronin::Path:../../..>]
     #
     def self.up(n,separator=File::SEPARATOR)
-      if n.kind_of?(Integer)
+      case n
+      when Integer
         if n == 0
           return separator
         elsif n < 0
@@ -83,7 +84,7 @@ module Ronin
         dirs = (['..'] * (n-1))
 
         return Path.new(path.join(*dirs))
-      elsif n.kind_of?(Enumerable)
+      when Enumerable
         return n.map { |i| self.up(i) }
       else
         raise(ArgumentError,"The first argument of Path.up must be either an Integer or Enumerable")
@@ -105,13 +106,13 @@ module Ronin
     #   # => #<Ronin::Path:../../../../../../../etc/passwd>
     #
     def join(*names)
-      sub_dirs = names.map { |name| name.to_s }
+      names.map! { |name| name.to_s }
 
       # filter out errant directory separators
-      sub_dirs.reject! { |dir| dir == @separator }
+      names.reject! { |dir| dir == @separator }
 
       # join the path
-      sub_path = sub_dirs.join(@separator)
+      sub_path = names.join(@separator)
 
       path = if self.root?
                # prefix the root dir

data/lib/ronin/support/inflector.rb

@@ -17,23 +17,37 @@
 # along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-begin
-  require 'active_support/inflector'
-rescue LoadError
-  begin
-    require 'extlib/inflection'
-  rescue LoadError
-    raise(LoadError,"unable to load 'active_support/inflector' or 'extlib/inflection'",caller)
-  end
-end
-
 module Ronin
   module Support
-    # The Inflector that Ronin will use.
-    Inflector = if Object.const_defined?(:ActiveSupport)
-                  ActiveSupport::Inflector
-                else
-                  Extlib::Inflection
-                end
+    inflectors = [
+      {
+        :path => 'dm-core/support/inflector',
+        :const => 'DataMapper::Inflector'
+      },
+      {
+        :path => 'active_support/inflector',
+        :const => 'ActiveSupport::Inflector'
+      },
+      {
+        :path => 'extlib/inflection',
+        :const => 'Extlib::Inflection'
+      }
+    ]
+    inflector_const = 'Inflector'
+
+    inflectors.each do |inflector|
+      begin
+        require inflector[:path]
+      rescue LoadError
+        next
+      end
+
+      const_set(inflector_const, eval("::#{inflector[:const]}"))
+      break
+    end
+
+    unless const_defined?(inflector_const)
+      raise(LoadError,"unable to load or find any Inflectors")
+    end
   end
 end

data/lib/ronin/support/version.rb

@@ -20,6 +20,6 @@
 module Ronin
   module Support
     # ronin-support version
-    VERSION = '0.1.0.rc1'
+    VERSION = '0.1.0.rc2'
   end
 end

data/ronin-support.gemspec

@@ -9,7 +9,7 @@ rescue NameError
     require 'ore/specification'
     retry
   rescue LoadError
-    STDERR.puts "The 'ronin-support.gemspec' file requires Ore."
+    STDERR.puts "The '#{__FILE__}' file requires Ore."
     STDERR.puts "Run `gem install ore-core` to install Ore."
   end
 end

data/spec/support/inflector_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'ronin/support/inflector'
+
+describe "Ronin::Support::Inflector" do
+  subject { Ronin::Support::Inflector }
+
+  it "should not be nil" do
+    subject.should_not be_nil
+  end
+
+  it "should support pluralizing words" do
+    subject.pluralize('word').should == 'words'
+  end
+
+  it "should support singularizing words" do
+    subject.singularize('words').should == 'word'
+  end
+
+  it "should support humanizing words" do
+    subject.humanize('word_id').should == 'Word'
+  end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ronin-support
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 1
-  - 0
-  - rc1
-  version: 0.1.0.rc1
+  prerelease: 6
+  version: 0.1.0.rc2
 platform: ruby
 authors: 
 - Postmodern
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -08:00
+date: 2011-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,76 +20,74 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
+        version: "0.2"
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: uri-query_params
+  name: combinatorics
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 2
-        version: 0.5.2
+        version: "0.3"
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: data_paths
+  name: uri-query_params
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
+        version: "0.5"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: data_paths
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
+        version: "0.2"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.1
+  type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: bundler
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 4
-        version: 0.6.4
+        version: 1.0.10
   type: :development
   prerelease: false
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.4
+  type: :development
+  prerelease: false
+  version_requirements: *id006
 description: Ronin Support is a support library for Ronin. Ronin Support contains many of the convenience methods used by Ronin and additional libraries.
-email: postmodern.mod3@gmail.com
+email: 
+- postmodern.mod3@gmail.com
 executables: []
 
 extensions: []
@@ -223,6 +216,7 @@ files:
 - spec/network/ssl_spec.rb
 - spec/path_spec.rb
 - spec/spec_helper.rb
+- spec/support/inflector_spec.rb
 - spec/support_spec.rb
 - spec/templates/classes/example_erb.rb
 - spec/templates/classes/example_template.rb
@@ -245,25 +239,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: ronin-support
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A support library for Ronin.
@@ -274,6 +260,7 @@ test_files:
 - spec/network/ssl_spec.rb
 - spec/templates/erb_spec.rb
 - spec/templates/template_spec.rb
+- spec/support/inflector_spec.rb
 - spec/path_spec.rb
 - spec/extensions/file_spec.rb
 - spec/extensions/kernel_spec.rb