cistern 0.9.2 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e2a073ec9812c931fb912227d9ad1c2b90e2f3e
-  data.tar.gz: aedb93e04e22e42d386c9608f3b18bdc18d3987e
+  metadata.gz: 654c51d23fb889c16d378ffd6b0517dd8a9bea01
+  data.tar.gz: bb865084d2e05d0f07647ca6cfc193aae4ba277a
 SHA512:
-  metadata.gz: 1ff0f6baa544d2bad3f19eb81b2bc7aa45dc65c8ceecbf3c7b13858143fdc4d3f7c97c8c768af925731a3529ae350eb75891d6169305a35ce7e3b0e1cb2ada14
-  data.tar.gz: 6d2bf4ed911387a1d2ab0f544092b628a646086e11f3a966d368a9bab8b393fb6dd6f22d0573b09dee81f9f6a50406a2eea3e03adf93b0b94c1aed4dca6d0138
+  metadata.gz: 2686e1a240fc0bbca101c446c09a5bd06eed8dd76e15c62243be044afa0316f84d8b5eadefcc8b22b092e3024d155da155a0db176776ab75ca3d4a3391641fa6
+  data.tar.gz: 9743c3688790d9b67ba0c24528dced11f0559126eb821103f1eb5d56c13fd1cdb7494b6f0e0d4956fddd3415291f99aac199f1356f733c9d6251494ae08dfe77

data/lib/cistern/model.rb

@@ -16,6 +16,11 @@ class Cistern::Model
     merge_attributes(attributes)
   end
 
+  def update(attributes)
+    merge_attributes(attributes)
+    save
+  end
+
   def save
     raise NotImplementedError
   end

data/lib/cistern/service.rb

@@ -117,8 +117,8 @@ class Cistern::Service
       @mocked_requests ||= []
     end
 
-    def request(request_name)
-      requests << request_name
+    def request(request_name, options={})
+      requests << [request_name, options]
     end
 
     def collection(collection_name, options={})
@@ -144,18 +144,27 @@ class Cistern::Service
     def setup_requirements
       @required ||= false
       unless @required
+
+        # setup models
         models.each do |model, options|
-          require File.join(@model_path, model.to_s) unless options[:require] == false
-          class_name = model.to_s.split("_").map(&:capitalize).join
+          unless options[:require] == false
+            require(options[:require] || File.join(@model_path, model.to_s))
+          end
+
+          class_name    = options[:class] || model.to_s.split("_").map(&:capitalize).join
+          singular_name = options[:model] || model.to_s.gsub("/", "_")
+
           self.const_get(:Collections).module_eval <<-EOS, __FILE__, __LINE__
-            def #{model}(attributes={})
+            def #{singular_name}(attributes={})
               #{service}::#{class_name}.new({connection: self}.merge(attributes))
             end
           EOS
         end
-        requests.each do |request|
-          unless service::Real.method_defined?(request.to_s)
-            require File.join(@request_path, request.to_s)
+
+        # setup requests
+        requests.each do |request, options|
+          unless options[:require] == false || service::Real.method_defined?(request.to_s)
+            require(options[:require] || File.join(@request_path, request.to_s))
           end
 
           if service::Mock.method_defined?(request)
@@ -168,22 +177,23 @@ class Cistern::Service
             EOS
           end
         end
+
+        # setup collections
         collections.each do |collection, options|
           unless options[:require] == false
-            if @collection_path
-              require File.join(@collection_path, collection.to_s)
-            else
-              require File.join(@model_path, collection.to_s)
-            end
+            require(options[:require] || File.join(@collection_path || @model_path, collection.to_s))
           end
 
-          class_name = collection.to_s.split("_").map(&:capitalize).join
+          class_name = collection.to_s.split("/").map(&:capitalize).join("::").split("_").map { |s| "#{s[0].upcase}#{s[1..-1]}" }.join
+          plural_name = options[:collection] || collection.to_s.gsub("/", "_")
+
           self.const_get(:Collections).module_eval <<-EOS, __FILE__, __LINE__
-            def #{collection}(attributes={})
+            def #{plural_name}(attributes={})
               #{service}::#{class_name}.new({connection: self}.merge(attributes))
             end
           EOS
         end
+
         @required = true
       end
     end

data/lib/cistern/version.rb

@@ -1,3 +1,3 @@
 module Cistern
-  VERSION = "0.9.2"
+  VERSION = "0.10.2"
 end

data/spec/collection_spec.rb

@@ -1,10 +1,12 @@
 require 'spec_helper'
 
 describe "Cistern::Collection" do
+
   class SampleCollectionModel < Cistern::Model
     identity :id
     attribute :name
   end
+
   class SampleCollection < Cistern::Collection
     model SampleCollectionModel
 

data/spec/model_spec.rb

@@ -2,6 +2,25 @@ require 'spec_helper'
 
 describe "Cistern::Model" do
 
+  describe "#update" do
+    class UpdateSpec < Cistern::Model
+      identity :id
+      attribute :name
+      attribute :properties
+
+      def save
+        attributes
+      end
+    end
+
+    it "should merge and save attributes" do
+      model = UpdateSpec.new(name: "steve")
+      model.save
+
+      expect(model.update(name: "karen")).to eq(name: "karen")
+    end
+  end
+
   it "should duplicate a model" do
     class DupSpec < Cistern::Model
       identity :id
@@ -15,7 +34,7 @@ describe "Cistern::Model" do
     expect(duplicate).to eq(model)
     expect(duplicate).to eql(model)
 
-    model.name= "anotherstring"
+    model.name = "anotherstring"
     expect(duplicate.name).to eq("string")
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.2
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email: