named-routes 0.2.5 → 0.2.6

data/Gemfile

@@ -1,10 +1,8 @@
 source :gemcutter
-
-gem "extlib", "0.9.15"
+gemspec
 
 group :test do
   gem "diff-lcs", "1.1.2"
-  gem "jeweler", "1.5.2"
   gem "rr", "1.0.2"
   gem "rspec", "2.3.0"
 end

data/Gemfile.lock

@@ -1,14 +1,14 @@
+PATH
+  remote: .
+  specs:
+    named-routes (0.2.6)
+      activesupport (>= 3.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.0.9)
     diff-lcs (1.1.2)
-    extlib (0.9.15)
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
     rr (1.0.2)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
@@ -24,7 +24,6 @@ PLATFORMS
 
 DEPENDENCIES
   diff-lcs (= 1.1.2)
-  extlib (= 0.9.15)
-  jeweler (= 1.5.2)
+  named-routes!
   rr (= 1.0.2)
   rspec (= 2.3.0)

data/Rakefile

@@ -3,27 +3,20 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "named-routes"
-    s.summary = "A simple and generic named routes api. It works really well with Sinatra."
-    s.email = "brian.takita@gmail.com"
-    s.homepage = "http://github.com/btakita/named-routes"
-    s.summary = "A simple and generic named routes api. It works really well with Sinatra."
-    s.authors = ["Brian Takita"]
-    s.files = FileList[
-      '[A-Z]*',
-      '*.rb',
-      'lib/**/*.rb',
-      'spec/**/*.rb'
-    ].to_a
-    s.test_files = Dir.glob('spec/*_spec.rb')
-    s.has_rdoc = true
-    s.extra_rdoc_files = [ "README.md", "CHANGES" ]
-    s.rdoc_options = ["--main", "README.md", "--inline-source", "--line-numbers"]
-    s.add_dependency "extlib", ">= 0.9.15"
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  # Put spec opts in a file named .rspec in root
+end
+
+desc "Generate code coverage"
+RSpec::Core::RakeTask.new(:coverage) do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
 end

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/named-routes/routes.rb

@@ -2,103 +2,96 @@ module NamedRoutes
   class Routes
     class_inheritable_accessor :host, :prefix
 
-    extend(Module.new do
-      def instance
-        @instance ||= new
-      end
+    module Definition
+      extend ActiveSupport::Concern
 
-      def http
-        SchemedUri.new(self, "http")
-      end
+      module InstanceMethods
+        def eval(*args)
+          self.class.eval(*args)
+        end
 
-      def https
-        SchemedUri.new(self, "https")
+        def as_json(*args)
+          self.class.defined_routes
+        end
       end
 
-      def route(name, definition, include_prefix=true)
-        full_definition = eval(definition, {}, :prefix => include_prefix)
-        _defined_routes[name.to_s] = full_definition
-        define_method name do |*args|
-          self.class.eval(full_definition, [args.first].compact.first || {})
+      module ClassMethods
+        def instance
+          @instance ||= new
         end
-        yield full_definition if block_given?
-        full_definition
-      end
-      alias_method :path, :route
-      alias_method :uri, :route
 
-      def defined_routes
-        (ancestors.reverse + [self]).inject({}) do |memo, klass|
-          memo.merge!(klass._defined_routes) if klass.respond_to?(:_defined_routes)
-          memo
+        def http
+          SchemedUri.new(self, "http")
         end
-      end
 
-      def _defined_routes
-        @_defined_routes ||= {}
-      end
+        def https
+          SchemedUri.new(self, "https")
+        end
 
-      def eval(definition, params_arg={}, options={})
-        full_definition = (options[:prefix] && prefix) ? File.join("", prefix, definition) : definition
-        params = Mash.new(params_arg)
-        uri_string = if params.empty?
+        def route(name, definition, include_prefix=true)
+          full_definition = eval(definition, {}, :prefix => include_prefix)
+          _defined_routes[name.to_s] = full_definition
+          define_method name do |*args|
+            self.class.eval(full_definition, [args.first].compact.first || {})
+          end
+          yield full_definition if block_given?
           full_definition
-        else
-          full_definition.split("/").map do |segment|
-            segment_value = segment[/^:(.*)/, 1]
-            segment_value_parts = segment_value.to_s.split(".")
-            segment_name = segment_value_parts[0]
-            if segment_name
-              param_name = params.delete(File.basename(segment_name, '.*').to_s)
-              URI.escape([param_name, *segment_value_parts[1..-1]].join("."))
-            else
-              segment
-            end
-          end.join("/")
         end
-        unless params.empty?
-          uri_string << "?#{escape_params(params).to_params.gsub("%20", "+")}"
+        alias_method :path, :route
+        alias_method :uri, :route
+
+        def defined_routes
+          (ancestors.reverse + [self]).inject({}) do |memo, klass|
+            memo.merge!(klass._defined_routes) if klass.respond_to?(:_defined_routes)
+            memo
+          end
         end
-        uri_string
-      end
 
-      def escape_params(params={})
-        params.inject({}) do |memo, kv|
-          key, value = kv
-          memo[URI.escape(key)] = if value.is_a?(Hash)
-            escape_params(value)
-          elsif value.is_a?(Array)
-            value.map { |v| URI.escape(v.to_s) }
+        def _defined_routes
+          @_defined_routes ||= {}
+        end
+
+        def eval(definition, params_arg={}, options={})
+          full_definition = (options[:prefix] && prefix) ? File.join("", prefix, definition) : definition
+          params = HashWithIndifferentAccess.new(params_arg)
+          uri_string = if params.empty?
+            full_definition
           else
-            URI.escape(value.to_s)
+            full_definition.split("/").map do |segment|
+              segment_value = segment[/^:(.*)/, 1]
+              segment_value_parts = segment_value.to_s.split(".")
+              segment_name = segment_value_parts[0]
+              if segment_name
+                param_name = params.delete(File.basename(segment_name, '.*').to_s)
+                URI.escape([param_name, *segment_value_parts[1..-1]].join("."))
+              else
+                segment
+              end
+            end.join("/")
+          end
+          unless params.empty?
+            uri_string << "?#{params.to_param}"
           end
-          memo
+          uri_string
         end
-      end
 
-      def normalize(uri)
-        uri.gsub(Regexp.new("^#{File.join("", prefix.to_s)}"), "/").gsub("//", "/")
-      end
+        def normalize(uri)
+          uri.gsub(Regexp.new("^#{File.join("", prefix.to_s)}"), "/").gsub("//", "/")
+        end
 
-      def as_json(*args)
-        instance.as_json(*args)
-      end
+        def as_json(*args)
+          instance.as_json(*args)
+        end
 
-      def method_missing(method_name, *args, &block)
-        if instance.respond_to?(method_name)
-          instance.send(method_name, *args, &block)
-        else
-          super
+        def method_missing(method_name, *args, &block)
+          if instance.respond_to?(method_name)
+            instance.send(method_name, *args, &block)
+          else
+            super
+          end
         end
       end
-    end)
-
-    def eval(*args)
-      self.class.eval(*args)
-    end
-
-    def as_json(*args)
-      self.class.defined_routes
     end
+    include Definition
   end
 end

data/lib/named-routes.rb

@@ -1,4 +1,8 @@
-require "extlib"
+require "active_support"
+require "active_support/concern"
+require "active_support/hash_with_indifferent_access"
+require "active_support/core_ext/object/to_query"
+require "active_support/core_ext/class/inheritable_attributes"
 require "uri"
 
 module NamedRoutes

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: named-routes
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 5
-  version: 0.2.5
+  prerelease: 
+  version: 0.2.6
 platform: ruby
 authors: 
 - Brian Takita
@@ -18,35 +14,16 @@ date: 2011-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: extlib
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 15
-        version: 0.9.15
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: extlib
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 15
-        version: 0.9.15
+        version: 3.0.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 description: 
 email: brian.takita@gmail.com
 executables: []
@@ -86,21 +63,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A simple and generic named routes api. It works really well with Sinatra.