cyby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53aa37324f5116067ffb2c6f162f39582d9747c4
-  data.tar.gz: e690a048a7c5214b2859d7e984d2223a95c0000b
+  metadata.gz: 3c8d7908636d29a6236ca003328acb4f1ec0a3c4
+  data.tar.gz: d78b0aa956b2714c6ed245a2338e159b6d498dea
 SHA512:
-  metadata.gz: a52c55e6cdcd89396a46428f2a7886005b5a1e592fc0f201bbcab8a1cc4090773a58832ca09d2dbc971f2cbdda5784cb484174595a3d0c13fe3f24bb2f5a7ec0
-  data.tar.gz: 2e9463720c254d369bd1d597818c9ebf75fc9b792f33241d58272b6330fda7dbe146bdfeba9958eeeaabb7d874b82918aaf9fc39c554d5283c052a3bbe4287f5
+  metadata.gz: 0ed719e660c7ab0af392b57b981a7f52f805f3ad1edd8e7c188279ac60bc919f675897dd102d39b8e6996584dc1623d4a653aa849e362bddf75874dfe1a56569
+  data.tar.gz: 44b66ab37fbe39a822814cc4ec23693c17bb028bbe77ff7dc456fbb6edd107448ae299e141202f764ae949757efb2fc3418b032d91cf46a7cabbd72fe8db72ac

data/README.md

@@ -69,6 +69,11 @@ Get records.
     end
     records = relation.all
 
+    # Combining defined conditions
+    adult = app.where("age >= ?", 18)
+    man = app.where("sex in ?", ["man"])
+    records = app.where(adult).and(man)
+
 Create a record.
 
     record = app.new_record

data/lib/cyby/kintone/app.rb

@@ -32,15 +32,20 @@ module Cyby
       end
 
       def save(record)
-        json = record.to_json_for_save
-        if json[:id]
-          resp = @api.put("/record.json", json)
+        if record.changed?
+          json = record.to_json_for_save
+          if json[:id]
+            resp = @api.put("/record.json", json)
+          else
+            resp = @api.post("/record.json", json)
+            record["$id"] = resp["id"]
+          end
+          record["$revision"] = resp["revision"]
+          record.unchanged
+          true
         else
-          resp = @api.post("/record.json", json)
-          record["$id"] = resp["id"]
+          false
         end
-        record["$revision"] = resp["revision"]
-        true
       end
 
       def delete(record)

data/lib/cyby/kintone/record.rb

@@ -4,6 +4,7 @@ module Cyby
       def initialize(app, raw = {})
         @app = app
         @raw = raw
+        @changed = {}
       end
 
       def [](key)
@@ -16,15 +17,29 @@ module Cyby
 
       def []=(key, value)
         @raw[key] ||= {}
-        case key
-        when "$id"
-          @raw[key]["type"] = "__ID__"
-        when "$revision"
-          @raw[key]["type"] = "__REVISION__"
+        if @raw[key]["value"] != value
+          changed(key)
         end
         @raw[key]["value"] = value
       end
 
+      def changed(field)
+        case field
+        when "$id", "$revision"
+          # Do nothing
+        else
+          @changed[field] = true
+        end
+      end
+
+      def changed?
+        @changed.any?
+      end
+
+      def unchanged
+        @changed = {}
+      end
+
       def method_missing(method_name, *args)
         key = method_name.to_s
         if key[-1] == "="
@@ -52,12 +67,7 @@ module Cyby
 
       def to_json_for_save
         record = @raw.select do |key, value|
-          case value["type"]
-          when "CREATOR", "CREATED_TIME", "MODIFIER", "UPDATED_TIME", "STATUS", "STATUS_ASSIGNEE", "RECORD_NUMBER", "__REVISION__", "__ID__"
-            false
-          else
-            true
-          end
+          @changed[key]
         end
         if @raw["$id"]
           { id: @raw["$id"]["value"], record: record }

data/lib/cyby/kintone/relation.rb

@@ -1,14 +1,16 @@
 module Cyby
   module Kintone
     class Relation
+      attr_reader :condition, :order_by, :fields
       include Enumerable
 
       alias_method :all, :to_a
 
       def initialize(app)
         @app = app
-        @where = Query::Where.new
+        @condition = Query::Where.new
         @order_by = []
+        @fields = nil
       end
 
       def each
@@ -22,16 +24,21 @@ module Cyby
       end
 
       def where(cond, *params)
-        @where = Query::Where.new(cond, *params)
+        case cond
+        when String
+          @condition = Query::Where.new(cond, *params)
+        else
+          @condition = cond.condition
+        end
         self
       end
 
       def and(cond, *params)
         case cond
         when String
-          @where = Query::WhereAnd.new(@where, Query::Where.new(cond, *params))
+          @condition = Query::WhereAnd.new(@condition, Query::Where.new(cond, *params))
         else
-          @where = Query::WhereAnd.new(@where, cond)
+          @condition = Query::WhereAnd.new(@condition, cond.condition)
         end
         self
       end
@@ -39,9 +46,9 @@ module Cyby
       def or(cond, *params)
         case cond
         when String
-          @where = Query::WhereOr.new(@where, Query::Where.new(cond, *params))
+          @condition = Query::WhereOr.new(@condition, Query::Where.new(cond, *params))
         else
-          @where = Query::WhereOr.new(@where, cond)
+          @condition = Query::WhereOr.new(@condition, cond.condition)
         end
         self
       end
@@ -62,7 +69,7 @@ module Cyby
       end
 
       def to_query
-        query = @where.to_query
+        query = @condition.to_query
         if @order_by.any?
           query += " order by #{@order_by.join(',')}"
         end

data/lib/cyby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hiroyuki Sato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler