iseshima_store 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 150b59a929f9e4d2d3c94fa364c133ca92ac1c35
-  data.tar.gz: 06f6f06c95893c6936d873e459add5e3edeb8071
+  metadata.gz: e677b4e94938ba2ebb108ddff93bd1165fcaf852
+  data.tar.gz: 6189431bd15b92d340c4722a79b9ecb2b21fac3f
 SHA512:
-  metadata.gz: c2ea30f42d2a7aacc96de5e1cc0f04ba43228a4de0e5ae1a3460816d7747a06af61165afb6da8142c8ee1cadf2d2903b19eff65ff39a2372ac5608454273bb27
-  data.tar.gz: 3bd638ecd194ae779ce9529794055f4edf654a77f04e875934359868a9bae5483e7753a6cc3fc669ac393264c904505a4df794d4afb3deaae283106be3c86ac4
+  metadata.gz: 52fdbaddd2045fe46114d6b64815bc2e295d253e030ba33b23dd2adeb5ec5b274094bb63f6ff7f04bcec769db84f888b26a1ec584dc8f939adb90e3f77d22c3b
+  data.tar.gz: a8873566d8f87743350e9e5c8569f5918113c09c534f35c4cf68491a0d6dffe530a09a772d75472f7e16303ba42b27d4938166c539afac28834be27424d9fa00

data/lib/iseshima_store/base.rb

@@ -11,29 +11,30 @@ module IseshimaStore
     def self.included(klass)
       klass.extend SingleForwardable
       klass.extend ClassMethods
-      klass.def_delegators :scoping, :where, :all, :first, :last, :to_a
+      klass.def_delegators :scoping,
+        :where,
+        :all,
+        :first,
+        :last,
+        :to_a,
+        :parent,
+        :find,
+        :find_by
 
       klass.instance_eval do
-        attr_accessor :id, :created_at, :description
+        attr_accessor :id, :created_at, :description, :parent_key
       end
     end
 
     module ClassMethods
       attr_reader :properties
 
-      def scoping
-        IseshimaStore::Relation.new(self)
+      def destroy_all
+        scoping.each(&:destroy)
       end
 
-      def find(_id)
-        datastore = IseshimaStore::Connection.current
-        key = datastore.key(self.to_s, _id.to_i)
-        entity = datastore.find(key)
-        if entity
-          from_entity(entity)
-        else
-          raise EntityNotFound.new("cannot find entity with id #{_id}")
-        end
+      def scoping
+        IseshimaStore::Relation.new(self)
       end
 
       def attr_properties(*args)
@@ -41,16 +42,15 @@ module IseshimaStore
         @properties = args
       end
 
-      def find_by(hash)
-        where(hash).first
-      end
-
       def from_entity(entity)
         instance = self.new
         instance.id = entity.key.id
         entity.properties.to_hash.each do |name, value|
-          instance.send "#{name}=", value
+          if instance.respond_to?("#{name}=")
+            instance.send "#{name}=", value
+          end
         end
+        instance.parent_key = entity.key.parent
         instance
       end
 
@@ -79,21 +79,39 @@ module IseshimaStore
 
     def save!
       entity = to_entity
+      if @parent_key == ''
+        entity.key.parent = nil
+      else
+        entity.key.parent = @parent_key
+      end
       IseshimaStore::Connection.current.save(entity)
       self.id = entity.key.id
       self
     end
 
     def destroy
-      entity = to_entity
-      IseshimaStore::Connection.current.delete(entity)
+      if key.parent
+        key.parent = nil
+      end
+      IseshimaStore::Connection.current.delete(key)
+    end
+
+    def assign_entities(hash)
+      hash.each { |k, v|
+        k = k.to_s
+        if respond_to? "#{k}="
+          send("#{k}=", v)
+        end
+      }
+      self
     end
 
     def to_entity
       entity = Gcloud::Datastore::Entity.new
       entity.key = Gcloud::Datastore::Key.new(self.class.to_s, id)
       unless self.class.properties
-        raise StandardError.new("You have to define attr_properties in your model")
+        logger = Logger.new(STDOUT)
+        logger.warn "You may have to define attr_properties in your model"
       end
 
       self.class.properties.each do |property|
@@ -106,5 +124,29 @@ module IseshimaStore
       end
       entity
     end
+
+    def parent=(model)
+      if model
+        key = model.to_entity.key
+        self.parent_key = key
+      else
+        self.parent_key = ''
+      end
+    end
+
+    def parent
+      return @parent if @parent
+
+      if @parent_key
+        klass = Object.const_get(@parent_key.kind)
+        if klass.include?(IseshimaStore::Base)
+          @parent = klass.find(@parent_key.id)
+        end
+      end
+    end
+
+    def key
+      to_entity.key
+    end
   end
 end

data/lib/iseshima_store/connection.rb

@@ -11,8 +11,16 @@ module IseshimaStore
       yield(config)
     end
 
+    def self.datastore
+      Gcloud.datastore(config.project_id)
+    end
+
     def self.current
       @current ||= Gcloud.datastore(config.project_id)
     end
+
+    def self.clear_connection!
+      @current = nil
+    end
   end
 end

data/lib/iseshima_store/query_methods.rb

@@ -9,17 +9,30 @@ module IseshimaStore
       self
     end
 
+    def parent(model)
+      if model.respond_to?(:key)
+        @parent_key = model.key
+      end
+      self
+    end
+
     def all
       to_a
     end
 
+    def exists?
+      to_a.length > 0
+    end
+
     def to_a
       query = Gcloud::Datastore::Query.new
       query.kind(@klass.to_s)
       @where_clause.conditions.each do |condition|
         query.where(*condition)
       end
-
+      if @parent_key
+        query.ancestor(@parent_key)
+      end
       results = IseshimaStore::Connection.current.run(query)
       results.map { |entity| @klass.from_entity(entity) }
     end
@@ -27,5 +40,17 @@ module IseshimaStore
     def inspect
       to_a.inspect
     end
+
+    def find(_id)
+      entity = where(id: _id).first
+      unless entity
+        raise EntityNotFound.new("cannot find entity with id #{_id}")
+      end
+      entity
+    end
+
+    def find_by(hash)
+      where(hash).first
+    end
   end
 end

data/lib/iseshima_store/relation.rb

@@ -12,7 +12,7 @@ module IseshimaStore
 
     def initialize(klass)
       @klass = klass
-      @where_clause = IseshimaStore::WhereClause.new
+      @where_clause = IseshimaStore::WhereClause.new(@klass)
     end
 
     def spawn

data/lib/iseshima_store/version.rb

@@ -1,3 +1,3 @@
 module IseshimaStore
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/iseshima_store/where_clause.rb

@@ -2,7 +2,9 @@ module IseshimaStore
   class WhereClause
     attr_reader :conditions
 
-    def initialize
+    def initialize(klass)
+      # whereチェーンされているモデルのクラス
+      @klass = klass
       @conditions = []
     end
 
@@ -10,8 +12,15 @@ module IseshimaStore
 
       # conditions like where(name: 'taro', email: 'taro@gmail.com')
       if condition.is_a?(Hash)
-        condition.each do |key, value|
-          @conditions << [key.to_s, '=', value]
+        condition.each do |property, value|
+          property = property.to_s
+          if property == 'id'
+            datastore = IseshimaStore::Connection.current
+            key = datastore.key(@klass.to_s, value.to_i)
+            @conditions << ['__key__', '=', key]
+          else
+            @conditions << [property, '=', value]
+          end
         end
       # condisions like where('age', '>=', 16)
       elsif condition.is_a?(Array) && condition.length == 3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iseshima_store
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - kotohata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler