cistern 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32675f1c34663bf47fbea19c1f56e009884b8851
-  data.tar.gz: bd418e9510d7dfde5bc563a0e8a3471b174c6a2a
+  metadata.gz: 271e3b4819b0195e672410246c8388ff65f88ad0
+  data.tar.gz: 8be7d35f9a52253069c3dc19a6ab969ceeeb0b7f
 SHA512:
-  metadata.gz: 4f5044d67c9c3195a7ea0ec3f50186c4746aba1dec07cb16e582dc92d5b35219e913b9eeaef651ea75f71e6fc143603216339179627a516975741ccbf0c26014
-  data.tar.gz: 9db86cbe754c36b2c3f07e33b1b44c01d1c10dc97a746a61dd59cc1f616dd7574477b09c3ef0af24a5d1c7c025ff8a6d7162591c81ab4679746b2a1223bef0c7
+  metadata.gz: d863ffdb75969540acb17e44746d4432bde8ee733ccacc48da7ec3fbe47a099a77f191f1057c216a7a1471beebb1158952102ef304136094bee9d3c14e787500
+  data.tar.gz: 7834397862a3ec7262f979dd26bc6253fa345a98188e99df373b8633c9c4cdf00a55f0744130a6d8f5e35422b715dccfae4bc5837292b2e91aba3a457e4021ec

data/lib/cistern/client.rb

@@ -38,6 +38,7 @@ module Cistern::Client
     request_class    = options[:request]    || "Request"
     collection_class = options[:collection] || "Collection"
     model_class      = options[:model]      || "Model"
+    singular_class   = options[:singular]   || "Singular"
 
     interface = options[:interface] || :class
     interface_callback = (:class == interface) ? :inherited : :included
@@ -83,6 +84,20 @@ module Cistern::Client
         end
       end
 
+      #{interface} #{singular_class}
+        def self.#{interface_callback}(klass)
+          service.singularities << klass
+
+          klass.send(:include, ::Cistern::Singular)
+
+          super
+        end
+
+        def self.service
+          #{klass.name}
+        end
+      end
+
       #{interface} #{collection_class}
         include ::Cistern::Collection
 
@@ -154,6 +169,10 @@ module Cistern::Client
       @_models ||= []
     end
 
+    def singularities
+      @_singularities ||= []
+    end
+
     def recognized_arguments
       @_recognized_arguments ||= []
     end
@@ -214,6 +233,13 @@ module Cistern::Client
         Cistern::Model.service_model(self, klass, name)
       end
 
+      singularities.each do |klass|
+        name = klass.service_method ||
+          Cistern::String.underscore(klass.name.gsub("#{self.name}::", "").gsub("::", ""))
+
+        Cistern::Singular.service_singular(self, klass, name)
+      end
+
       @_setup = true
     end
 

data/lib/cistern/singular.rb

@@ -1,15 +1,23 @@
-class Cistern::Singular
-  extend Cistern::Attributes::ClassMethods
-  include Cistern::Attributes::InstanceMethods
+module Cistern::Singular
+
+  def self.service_singular(service, klass, name)
+    service.const_get(:Collections).module_eval <<-EOS, __FILE__, __LINE__
+      def #{name}(attributes={})
+        #{klass.name}.new(attributes.merge(service: self))
+      end
+    EOS
+  end
+
+  def self.included(klass)
+    klass.send(:extend, Cistern::Attributes::ClassMethods)
+    klass.send(:include, Cistern::Attributes::InstanceMethods)
+    klass.send(:extend, Cistern::Model::ClassMethods)
+  end
 
   attr_accessor :service
 
   def inspect
-    if Cistern.formatter
-      Cistern.formatter.call(self)
-    else
-      "#<#{self.class}>"
-    end
+    Cistern.formatter.call(self)
   end
 
   def initialize(options)
@@ -18,7 +26,9 @@ class Cistern::Singular
   end
 
   def reload
-    if new_attributes = fetch_attributes
+    new_attributes = fetch_attributes
+
+    if new_attributes
       merge_attributes(new_attributes)
     end
   end

data/lib/cistern/version.rb

@@ -1,3 +1,3 @@
 module Cistern
-  VERSION = "2.2.1"
+  VERSION = "2.2.3"
 end

data/spec/singular_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 describe "Cistern::Singular" do
-  class SampleSingular < Cistern::Singular
+  class SampleSingular < Sample::Singular
+
     attribute :name
     attribute :count, type: :number
 
@@ -16,11 +17,11 @@ describe "Cistern::Singular" do
   end
 
   it "should work" do
-    expect(SampleSingular.new(service: :fake).name).to eq("amazing")
+    expect(Sample.new.sample_singular.name).to eq("amazing")
   end
 
   it "should reload" do
-    singular = SampleSingular.new(service: :fake)
+    singular = Sample.new.sample_singular
     old_count = singular.count
     expect(singular.count).to eq(old_count)
     expect(singular.reload.count).to be > old_count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email: