active_pstore 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e0846e7c7c7a6853ef77ea26f6ae2aa498d63b7
-  data.tar.gz: f12f60b9965364eca7eb3787d511a9f380fcfc75
+  metadata.gz: 2b31a128f4714a2baa5e88e43c445f2c7743cd1e
+  data.tar.gz: d1ae729a41b8cc014d7b3a1a2c4141f72dda6622
 SHA512:
-  metadata.gz: 36c9f10ad414bc43ca0949fac8fbafea9ac20eb6189eaa1a7d3f412fb67abbedd28cc1f1ffe21cb58a8316c9e2060afd351592183d8d6257422eebdc19c53908
-  data.tar.gz: faf2198901dffda085992ca707df9c00c4f78377b6941a6929ac6d36f1ca7a9c777f567043f0ef8a7057517a9c549ad9d76992d306564c6b1e41ada4dab522b1
+  metadata.gz: 29dbecffbc7d6c10dee23113e43fc31391c1fb73382bcdb9ef4d6b5377eee32532d2fe3774d2a8b324a075b1c077dcb2e698a2336a874c4b58e55d1983616fda
+  data.tar.gz: 166d03edf976f0feb8bd9fd24a8698ecc8e219acf46bbc5745d37a88d0311efbd6fe940d548bc5bbab357492f86163884a36f8ce09c347345ad759f3791403ee

data/lib/active_pstore/attribute_methods.rb

@@ -2,7 +2,7 @@ module ActivePStore
   module AttributeMethods
     def [](attr)
       if respond_to? attr.to_sym
-        self.__send__(attr.to_sym)
+        self.public_send(attr.to_sym)
       else
         raise "undefined method `#{attr}'"
       end
@@ -10,7 +10,7 @@ module ActivePStore
 
     def []=(attr, value)
       if respond_to? "#{attr}=".to_sym
-        self.__send__("#{attr}=".to_sym, value)
+        self.public_send("#{attr}=".to_sym, value)
       else
         raise "undefined method `#{attr}='"
       end

data/lib/active_pstore/base.rb

@@ -20,7 +20,7 @@ module ActivePStore
       if attributes.present?
         attributes.each do |attr, val|
           if respond_to? "#{attr}=".to_sym
-            self.__send__("#{attr}=", val)
+            self.public_send("#{attr}=", val)
           else
             raise "undefined method `#{attr}='"
           end

data/lib/active_pstore/collection.rb

@@ -33,7 +33,7 @@ module ActivePStore
     end
 
     def method_missing(method_name, *args, &block)
-      @objects.__send__(method_name, *args, &block)
+      @objects.public_send(method_name, *args, &block)
     end
 
     def ==(comparison_object)

data/lib/active_pstore/dynamic_matchers.rb

@@ -21,7 +21,7 @@ module ActivePStore
 
       if match
         match.define
-        send(name, *arguments, &block)
+        public_send(name, *arguments, &block)
       else
         super
       end

data/lib/active_pstore/persistence.rb

@@ -39,14 +39,14 @@ module ActivePStore
     end
 
     def update_attribute(attr_name, attr_value)
-      self.__send__("#{attr_name}=", attr_value)
+      self.public_send("#{attr_name}=", attr_value)
 
       save
     end
 
     def update(attrs)
       attrs.each do |attr_name, attr_value|
-        self.__send__("#{attr_name}=", attr_value)
+        self.public_send("#{attr_name}=", attr_value)
       end
 
       save

data/lib/active_pstore/query_methods.rb

@@ -1,22 +1,48 @@
 module ActivePStore
   module QueryMethods
-    def where(conditions = {})
-      ret = all
+    class WhereChain
+      def initialize(scope)
+        @scope = scope
+      end
+
+      def not(conditions)
+        WhereDecider.new(@scope).decide(conditions, :reject)
+      end
+    end
+
+    class WhereDecider
+      def initialize(scope)
+        @scope = scope
+      end
 
-      return ret if conditions.empty?
-
-      conditions.each do |key, value|
-        ret = ret.select {|obj|
-          case value
-          when Array, Range
-            value.include?(obj.__send__(key))
-          else
-            obj.__send__(key) == value
-          end
-        }
+      def decide(conditions, method)
+        raise 'Illegal method error.' unless %i(reject select).include? method
+
+        return @scope if conditions.empty?
+
+        conditions.each do |key, value|
+          @scope = @scope.public_send(method) {|obj|
+            case value
+            when Array, Range
+              value.include?(obj.public_send(key))
+            else
+              obj.public_send(key) == value
+            end
+          }
+        end
+
+        ActivePStore::Collection.new(@scope)
       end
+    end
 
-      ActivePStore::Collection.new(ret)
+    def where(conditions = :chain)
+      ret = all
+
+      if conditions == :chain
+        WhereChain.new(ret)
+      else
+        WhereDecider.new(ret).decide(conditions, :select)
+      end
     end
   end
 end

data/lib/active_pstore/version.rb

@@ -1,3 +1,3 @@
 module ActivePStore
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_pstore
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Koichi ITO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-04 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -133,8 +133,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: This library has Active Record like interface. Use pstore to store data.
 test_files: []
+has_rdoc: