scope_composer 0.3.2 → 0.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjhkNmJhMTM5OGNlMTBlZmNhNTcwNWI0ZWZkODEyZmM3YzUzOWE5Nw==
+    MzU4YTJkM2I2ZGQzNTkxMjg4N2FmYWJiYmFiM2Q1OGRkNGNjNDJhYg==
   data.tar.gz: !binary |-
-    ZjlkODgxODVjYmQwNzAxNDg1YmFjNDFiMjI0ZGQzZmIzOGY3MDc1NQ==
+    YWJhNDJlZDdmNzI2NjhkNGU2ZjFlZGFlNGQ1NmVjNzFjOGUxNTZjOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmQwYjJlZTlhODdkMjJlYzc1ZjAxNmI0NmYyNTBmOWQ3NzJhYWEyYzZlZTdi
-    Nzk2NTY3NjM3YzI2MThhNDE4ZGY4NzViNTg5MTcxNDE1M2M0ODA0ODFkYmI1
-    ZDM1MzdjZmJiOGFhMmE2OGJhZTg1MDU2NzQ1MzhjODQ5NjhlNzI=
+    YTA0MWU3ZTA3MTE3OGJkZGVhZjU0MWFhZTMzZjA3MjU2MTEwM2ZkMGRmNWI5
+    MWRiYzBkMTkzMzdhYjgwZTU1YTBiMjBkYzNkZDQwMThlYjVjMmRjNmQyN2Qx
+    MWM3MDI3NWQ4NWU3NDgwOGFkYzUyMjg3ZDYyNmQyMGUyYjIwMGI=
   data.tar.gz: !binary |-
-    NjEwZDA5ZWJlYzdhNzI2ZjMzMGMwMzhiOWNjYTBkMjJmNGUyZTk4YWE4OTkz
-    NzUyNjA5Yjg2OTAzYTQ1MTEwYTVjMmIyOTAyZDA1MjU0ZmFlOTlkNjVmNjUw
-    MTcyOTc3NGI2MzE2MGIzMTM5OTlhMGFkMzMxY2U3ZGViMzkzMzI=
+    NTAxNWE1ZjAwMDc4NWE5MzcxNzcxMGY1ZTk4NTcyMTk2ZWVmZGMwZWUyNTJm
+    MTBlMGM1MTdkOGM2OTc2MWRmNzg0MjkwYTU4OTQxNDgzNjAyMjgzMTBiMzE0
+    YWY2MTc4OThlNThkYmYyZDBmZTM0NDc3MTRhY2IwOTE1ZTIwYjE=

data/lib/scope_composer/scope.rb

@@ -92,14 +92,14 @@ class Scope
       # define method
       define_method(name) do |*args|
         # if no value is given, act as a getter and retrieve the value
-        return scope_attributes[name] if args.first.nil?
+        return read_scope_attribute(key) if args.compact.blank?
         # otherwise set the value
         instance_exec(*args, &proc)
         # and return self for chaining
         self
       end
-      define_method("#{name}=") do |value|
-        self.send( name, value )
+      define_method("#{name}=") do |*args|
+        self.send( name, *args )
       end
       # add to scope list
       scopes[name] = proc
@@ -115,19 +115,15 @@ class Scope
       name = name.to_sym
       # define method
       define_method(name) do |*args|
-        # init
-        values = nil
-        values = args.first if args.count == 1
-        values = args if args.count > 1
-        # if no value is given, act as a getter
-        return scope_attributes[name] if values.nil?
-        # otherwise set the value
-        scope_attributes[name] = values
+        # without args return the value
+        return read_scope_attribute(name) if args.compact.blank?
+        # given args, set value
+        self.send("#{name}=", args)
         # and return self for chaining
         return self
       end
       define_method("#{name}=") do |*args|
-        self.send( name, *args )
+        write_scope_attribute(name, *args)
       end
       # add to scoping list
       scopes[name] = nil
@@ -137,6 +133,14 @@ class Scope
   
   delegate :to_param, to: :attributes
   
+  def read_scope_attribute(key)
+    scope_attributes[key]
+  end
+  
+  def write_scope_attribute(key, values)
+    scope_attributes[key] = (values.count == 1) ? values.first : values
+  end
+  
   def assign_attributes(*attrs)
     attrs = attrs.extract_options!
     attrs.each do |key, value|
@@ -144,17 +148,13 @@ class Scope
     end
   end
   
-  def attributes
-    self.class.scopes.keys.inject({}){|m,k| m.merge( k => attributes[k] ) }
-  end
-  
   def where(*args)
     attrs = args.extract_options!
     attrs.symbolize_keys!
     self.attributes = attrs
     self
   end
-
+  
   def attributes
     @attributes ||= {}
   end

data/lib/scope_composer/version.rb

@@ -1,3 +1,3 @@
 module ScopeComposer
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scope_composer
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement