dmichael-set-notation-helper 0.2 → 0.3

data/README.markdown

@@ -1,7 +1,7 @@
 SetNotationHelper
 =================
 
-A library providing set notation support for ActiveRecord models. Include this module in the models you want to support set notation finders and you are all set.
+A library providing set notation support for ActiveRecord models. Include this module in the models you want to support set notation finders and you are all set, or install the gem and add it to your environment to add support for all your models.
 
 To use:
   
@@ -11,7 +11,7 @@ To use:
 Installation
 ------------
 
-    sudo gem install set-notation-helper -s http://gems.github.com
+    sudo gem install dmichael-set-notation-helper -s http://gems.github.com
     
 Add the gem to your environment.rb file
     
@@ -28,7 +28,7 @@ If you are interested in matching for sets in the routes you can do something li
       /\{\s*([\d\-,\s*]*)\s*\}/
     ]
   	
-  	set_regexes.each do |regex|
+  	regexes.each do |regex|
       map.with_options( :controller => 'sounds', :action => 'index', :id => regex, :conditions => { :method => :get }) do |r|
         r.connect "/#{resource}/:id.:format"
         r.connect "/#{resource}/:id"

data/lib/set_notation_helper.rb

@@ -1,27 +1,8 @@
 module SetNotationHelper
   
   def self.included(base)
-    base.class_eval do
-      extend SetNotationHelper::ClassMethods    
-      
-      # This scope accepts either a String in the form "{1,2,3}" **OR** an Integer
-      named_scope :in_set, lambda { |*args|
-        value = args.first
-
-        # A string input is either a set or an integer in disguise
-        unless value.is_a?(String) || value.is_a?(Integer)
-          logger.error "[SetNotationHelper] You have given the helper something it cant use: #{value.class}. No filter applied!"
-          return {} 
-        end
-
-        if is_set?(value)
-          { :conditions => "#{table_name}.id IN (#{ parse_set(value).to_a.join(',') })" }
-        else
-          { :conditions => "#{table_name}.id = #{ value.to_i }" }
-        end
-      }
-         
-    end 
+    base.extend(ClassMethods)
+    # base.send :include, ClassMethods
   end
   
   def set_limit
@@ -29,6 +10,23 @@ module SetNotationHelper
   end
   
   module ClassMethods
+    
+    # This scope accepts either a String in the form "{1,2,3}" **OR** an Integer
+    named_scope :in_set, lambda { |*args|
+      value = args.first
+
+      # A string input is either a set or an integer in disguise
+      unless value.is_a?(String) || value.is_a?(Integer)
+        logger.error "[SetNotationHelper] You have given the helper something it cant use: #{value.class}. No filter applied!"
+        return {} 
+      end
+
+      if is_set?(value)
+        { :conditions => "#{table_name}.id IN (#{ parse_set(value).to_a.join(',') })" }
+      else
+        { :conditions => "#{table_name}.id = #{ value.to_i }" }
+      end
+    }
         
     def is_set_or_range?(input)
       if is_set?(input) or is_range?(input)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dmichael-set-notation-helper
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - David Michael