iseshima_store 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad2a0c29f44f30df8ffc1b1bf676a9370731e13f
-  data.tar.gz: afa1dfa84d0ed4c3c6e8a3e2f816b2bc58ce971f
+  metadata.gz: 150b59a929f9e4d2d3c94fa364c133ca92ac1c35
+  data.tar.gz: 06f6f06c95893c6936d873e459add5e3edeb8071
 SHA512:
-  metadata.gz: ddfe993d85bb0aca3dc33d3eececd4bff23a710b670bee4a1c4e7550deef7cc726bea1395de39302cd0a31827ddefc6c364f552aa987d891434a4581e386788b
-  data.tar.gz: f84ce3880a1891d91fe213d72b38d7164849c488bc593eacf340e124c79b4278820287c8bb75f8fab21a22ec343b7b9c10d0f91ed853b34d2e93bbd6068aa4af
+  metadata.gz: c2ea30f42d2a7aacc96de5e1cc0f04ba43228a4de0e5ae1a3460816d7747a06af61165afb6da8142c8ee1cadf2d2903b19eff65ff39a2372ac5608454273bb27
+  data.tar.gz: 3bd638ecd194ae779ce9529794055f4edf654a77f04e875934359868a9bae5483e7753a6cc3fc669ac393264c904505a4df794d4afb3deaae283106be3c86ac4

data/lib/iseshima_store/base.rb

@@ -5,15 +5,16 @@ require 'iseshima_store/relation'
 #http://googlecloudplatform.github.io/gcloud-ruby/docs/master/Gcloud/Datastore.html
 
 module IseshimaStore
-  module Base
+  class EntityNotFound < StandardError; end
 
+  module Base
     def self.included(klass)
       klass.extend SingleForwardable
       klass.extend ClassMethods
-      klass.def_delegators :scoping, :where, :all, :to_a
+      klass.def_delegators :scoping, :where, :all, :first, :last, :to_a
 
       klass.instance_eval do
-        attr_accessor :created_at, :description
+        attr_accessor :id, :created_at, :description
       end
     end
 
@@ -28,20 +29,20 @@ module IseshimaStore
         datastore = IseshimaStore::Connection.current
         key = datastore.key(self.to_s, _id.to_i)
         entity = datastore.find(key)
-        from_entity(entity)
+        if entity
+          from_entity(entity)
+        else
+          raise EntityNotFound.new("cannot find entity with id #{_id}")
+        end
       end
 
       def attr_properties(*args)
+        attr_accessor(*args)
         @properties = args
       end
 
       def find_by(hash)
-        key, value = hash.keys.first.to_s, hash.values.first.to_s
-        query = Gcloud::Datastore::Query.new
-        query.kind(self.to_s)
-        query.where(key, '=', value)
-        results = IseshimaStore::Connection.current.run(query)
-        results.map { |entity| from_entity(entity) }.first
+        where(hash).first
       end
 
       def from_entity(entity)
@@ -91,9 +92,17 @@ module IseshimaStore
     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")
+      end
+
       self.class.properties.each do |property|
         property = property.to_s
-        entity[property] = send(property)
+        value = send(property)
+        if value.is_a?(String)
+          value = value.force_encoding('UTF-8')
+        end
+        entity[property] = value
       end
       entity
     end

data/lib/iseshima_store/relation.rb

@@ -1,11 +1,14 @@
 require 'iseshima_store/query_methods'
 require 'iseshima_store/where_clause'
+require 'forwardable'
 
 module IseshimaStore
   class Relation
+    extend Forwardable
     include Enumerable
     include IseshimaStore::QueryMethods
     attr_accessor :where_clause
+    def_delegators :to_a, :first, :last
 
     def initialize(klass)
       @klass = klass

data/lib/iseshima_store/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iseshima_store
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - kotohata