sinatra-has_scope 0.0.2 → 0.1.0

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 *.gem
 .bundle
+Gemfile.lock

data/Gemfile

@@ -1,4 +1,4 @@
-source :gemcutter
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sinatra-has_scope.gemspec
 gemspec

data/lib/sinatra/has_scope.rb

@@ -13,6 +13,11 @@ module Sinatra
 
     attr_accessor :scopes_configuration
 
+    def self.registered(base)
+      base.scopes_configuration = { }
+      base.helpers HasScope::Helpers
+    end
+
     # Detects params from url and apply as scopes to your classes.
     #
     # == Options
@@ -66,75 +71,77 @@ module Sinatra
       end
     end
 
-    # Receives an object where scopes will be applied to.
-    #
-    # has_scope :graduation, :featured, :type => true
-    # has_scope :graduation, :by_degree
-    #
-    # get '/graduations' do
-    #   @graduations = apply_scopes(:graduation, Graduation, params).all
-    # end
-    #
-    def apply_scopes(scope_group, target, hash)
-      return target unless scopes_configuration
-
-      if self.scopes_configuration.key?(scope_group)
-        self.scopes_configuration[scope_group].each do |scope, options|
-          key = options[:as].to_s
-
-          if hash.key?(key)
-            value, call_scope = hash[key], true
-          elsif options.key?(:default)
-            value, call_scope = options[:default], true
-            value = value.call(self) if value.is_a?(Proc)
-          end
-
-          value = parse_value(options[:type], key, value)
-
-          if call_scope && (value.present? || options[:allow_blank])
-            target = call_scope_by_type(options[:type], scope, target, value, options)
+    module Helpers
+      # Receives an object where scopes will be applied to.
+      #
+      # has_scope :graduation, :featured, :type => true
+      # has_scope :graduation, :by_degree
+      #
+      # get '/graduations' do
+      #   @graduations = apply_scopes(:graduation, Graduation, params).all
+      # end
+      #
+      def apply_scopes(scope_group, target, hash)
+        return target unless settings.scopes_configuration
+
+        if settings.scopes_configuration.key?(scope_group)
+          settings.scopes_configuration[scope_group].each do |scope, options|
+            key = options[:as].to_s
+
+            if hash.key?(key)
+              value, call_scope = hash[key], true
+            elsif options.key?(:default)
+              value, call_scope = options[:default], true
+              value = value.call(self) if value.is_a?(Proc)
+            end
+
+            value = parse_value(options[:type], key, value)
+
+            if call_scope && (value.present? || options[:allow_blank])
+              target = call_scope_by_type(options[:type], scope, target, value, options)
+            end
           end
         end
-      end
 
-      target
-    end
-
-    # Set the real value for the current scope if type check.
-    def parse_value(type, key, value) #:nodoc:
-      if type == :boolean
-        TRUE_VALUES.include?(value)
-      elsif value && ALLOWED_TYPES[type].none?{ |klass| value.is_a?(klass) }
-        raise "Expected type :#{type} in params[:#{key}], got #{value.class}"
-      else
-        value
+        target
       end
-    end
 
-    # Call the scope taking into account its type.
-    def call_scope_by_type(type, scope, target, value, options) #:nodoc:
-      if type == :boolean
-        target.send(scope)
-      elsif value && options.key?(:using)
-        value = value.values_at(*options[:using])
-        target.send(scope, *value)
-      else
-        target.send(scope, value)
+      # Set the real value for the current scope if type check.
+      def parse_value(type, key, value) #:nodoc:
+        if type == :boolean
+          TRUE_VALUES.include?(value)
+        elsif value && ALLOWED_TYPES[type].none?{ |klass| value.is_a?(klass) }
+          raise "Expected type :#{type} in params[:#{key}], got #{value.class}"
+        else
+          value
+        end
       end
-    end
 
-    # Evaluates the scope options :if or :unless. Returns true if the proc
-    # method, or string evals to the expected value.
-    def applicable?(string_proc_or_symbol, expected) #:nodoc:
-      case string_proc_or_symbol
-        when String
-          eval(string_proc_or_symbol) == expected
-        when Proc
-          string_proc_or_symbol.call(self) == expected
-        when Symbol
-          send(string_proc_or_symbol) == expected
+      # Call the scope taking into account its type.
+      def call_scope_by_type(type, scope, target, value, options) #:nodoc:
+        if type == :boolean
+          target.send(scope)
+        elsif value && options.key?(:using)
+          value = value.values_at(*options[:using])
+          target.send(scope, *value)
         else
-          true
+          target.send(scope, value)
+        end
+      end
+
+      # Evaluates the scope options :if or :unless. Returns true if the proc
+      # method, or string evals to the expected value.
+      def applicable?(string_proc_or_symbol, expected) #:nodoc:
+        case string_proc_or_symbol
+          when String
+            eval(string_proc_or_symbol) == expected
+          when Proc
+            string_proc_or_symbol.call(self) == expected
+          when Symbol
+            send(string_proc_or_symbol) == expected
+          else
+            true
+        end
       end
     end
   end

data/lib/sinatra/has_scope/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module HasScope
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,49 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatra-has_scope
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Simon COURTOIS
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-06 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: HasScope readaptation for the Sinatra micro-framework
-email: 
+email:
 - scourtois@cubyx.fr
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.mdown
@@ -51,41 +41,28 @@ files:
 - lib/sinatra/has_scope.rb
 - lib/sinatra/has_scope/version.rb
 - sinatra-has_scope.gemspec
-has_rdoc: true
 homepage: http://rubygems.org/gems/sinatra-has_scope
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: sinatra-has_scope
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: HasScope equivalent for Sinatra
 test_files: []
-