cistern 0.12.3 → 1.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f214af97e02bf01188735dc497174c917a65c8f
-  data.tar.gz: ba7b5558199ebb2b11a16890c62e4e4b916d9ab9
+  metadata.gz: d450addd353c421e2096a7236b9df93588d33dd0
+  data.tar.gz: 1eed93cace8518f20b98d0576a672c2e32f825aa
 SHA512:
-  metadata.gz: 05b899eb55fb736798eb495edce085e5c4eabaa92d5778c2fc7fd81959ff55f5b64003daa13a8751b543d119dd536bc2f81e5d225f93ed34bc3824082001ef38
-  data.tar.gz: fbd8908440fdaff653e46cebe6c29480b353568ffc24bdcd4372b18ce1cec18a6f6b996db48e1d2ac39c9e5310236442e86487f13fe9abc9b98f7e73d884402e
+  metadata.gz: 787f6a8105570622d8846676e87f04bdeb53a15d88ffe6e18ba54afa264b7aeb4c893cfdafd1cf924c3ebdbfda6480aab88b32580bb334283cfec801cad12d17
+  data.tar.gz: abd365799a52bc3192712595b7574b8aad97975a66535bc78f073442e32c43c73b4ff8bfb167e71410ad0a567cc775914acc9f9ac1dbf8f979a6734eeb95ccde

data/Gemfile

@@ -8,7 +8,7 @@ group :test do
   gem "guard-bundler", "~> 2.0", require: false
   gem "pry-nav"
   gem "rake"
-  gem "rspec", "~> 3.3"
+  gem "rspec", "~> 2.99"
   gem "redis-namespace", "~> 1.4", "< 1.5"
   gem "codeclimate-test-reporter", require: false
 end

data/README.md

@@ -58,29 +58,6 @@ All declared requests can be listed via `Cistern::Service#requests`.
 Foo::Client.requests # => [:get_bar, :get_bars]
 ```
 
-##### Forward Compatible
-
-Ish.
-
-```ruby
-# client/requests/get_bar.rb
-class Foo:Client::GetBar
-
-  service Foo::Client
-
-  def real(bar_id)
-    connection.request("http://example.org/bar/#{bar_id}")
-  end
-
-  def mock
-    # do some mock things
-  end
-end
-```
-
-In this context, `connection` is reference to the `Cistern::Service`.
-
-
 #### Models and Collections
 
 Models and collections have declaration semantics similar to requests.  Models and collections are enumerated via `model` and `collection` respectively.
@@ -231,7 +208,7 @@ Patient::Mock.store_in(:hash)
 
 ### Model
 
-* `connection` represents the associated `Foo::Client` instance.
+* `service` represents the associated `Foo::Client` instance.
 * `collection` represents the related collection (if applicable)
 
 Example
@@ -248,7 +225,7 @@ class Foo::Client::Bar < Cistern::Model
     params  = {
       "id" => self.identity
     }
-    self.connection.destroy_bar(params).body["request"]
+    self.service.destroy_bar(params).body["request"]
   end
 
   def save
@@ -262,11 +239,11 @@ class Foo::Client::Bar < Cistern::Model
     }
 
     if new_record?
-      merge_attributes(connection.create_bar(params).body["bar"])
+      merge_attributes(service.create_bar(params).body["bar"])
     else
       requires :identity
 
-      merge_attributes(connection.update_bar(params).body["bar"])
+      merge_attributes(service.update_bar(params).body["bar"])
     end
   end
 end
@@ -309,7 +286,7 @@ class Foo::Client::Bars < Cistern::Collection
   model Foo::Client::Bar
 
   def all(params = {})
-    response = connection.get_bars(params)
+    response = service.get_bars(params)
 
     data = response.body
 
@@ -323,11 +300,11 @@ class Foo::Client::Bars < Cistern::Collection
     }
     params.merge!("location" => options[:location]) if options.key?(:location)
 
-    connection.requests.new(connection.discover_bar(params).body["request"])
+    service.requests.new(service.discover_bar(params).body["request"])
   end
 
   def get(id)
-    if data = connection.get_bar("id" => id).body["bar"]
+    if data = service.get_bar("id" => id).body["bar"]
       new(data)
     else
       nil

data/lib/cistern.rb

@@ -9,6 +9,7 @@ module Cistern
   Timeout = Class.new(Error)
 
   require 'cistern/hash'
+  require 'cistern/string'
   require 'cistern/mock'
   require 'cistern/wait_for'
   require 'cistern/attributes'
@@ -16,11 +17,10 @@ module Cistern
   require 'cistern/model'
   require 'cistern/service'
   require 'cistern/singular'
+  require 'cistern/request'
   require 'cistern/data'
   require 'cistern/data/hash'
   require 'cistern/data/redis'
-  require 'cistern/request'
-  require 'cistern/string'
 
   extend WaitFor
 

data/lib/cistern/attributes.rb

@@ -121,19 +121,9 @@ module Cistern::Attributes
     def read_attribute(name)
       options = self.class.attributes[name] || {}
       # record the attribute was accessed
-      begin
-        self.class.attributes[name.to_s.to_sym][:coverage_hits] += 1
-      rescue
-        nil
-      end
-
-      default = options[:default]
-
-      unless default.nil?
-        default = Marshal.load(Marshal.dump(default))
-      end
+      self.class.attributes[name.to_s.to_sym][:coverage_hits] += 1 rescue  nil
 
-      attributes.fetch(name.to_s.to_sym, default)
+      attributes.fetch(name.to_s.to_sym, options[:default])
     end
 
     def write_attribute(name, value)
@@ -183,39 +173,26 @@ module Cistern::Attributes
     end
 
     def merge_attributes(new_attributes = {})
-      protected_methods  = (Cistern::Model.instance_methods - [:connection, :identity, :collection])
-      ignored_attributes = self.class.ignored_attributes
-      class_attributes   = self.class.attributes
-      class_aliases      = self.class.aliases
-
       new_attributes.each do |_key, value|
-        string_key = _key.kind_of?(String) ? _key : _key.to_s
-        symbol_key = case _key
-              when String
-                _key.to_sym
-              when Symbol
-                _key
-              else
-                string_key.to_sym
-              end
-
+        key = _key.to_s.to_sym
         # find nested paths
-        value.is_a?(::Hash) && class_attributes.each do |name, options|
-          if options[:squash] && options[:squash].first == string_key
-            send("#{name}=", {symbol_key => value})
+        value.is_a?(::Hash) && self.class.attributes.each do |name, options|
+          if (options[:squash] || []).first == key.to_s
+            send("#{name}=", {key => value})
           end
         end
 
-        unless ignored_attributes.include?(symbol_key)
-          if class_aliases.has_key?(symbol_key)
-            class_aliases[symbol_key].each do |aliased_key|
+        unless self.class.ignored_attributes.include?(key)
+          if self.class.aliases.has_key?(key)
+            self.class.aliases[key].each do |aliased_key|
               send("#{aliased_key}=", value)
             end
           end
 
-          assignment_method = "#{string_key}="
-          if !protected_methods.include?(symbol_key) && self.respond_to?(assignment_method, true)
-            send(assignment_method, value)
+          protected_methods = Cistern::Model.instance_methods - [:service, :identity, :collection]
+
+          if !protected_methods.include?(key) && self.respond_to?("#{key}=", true)
+            send("#{key}=", value)
           end
         end
       end
@@ -259,7 +236,7 @@ module Cistern::Attributes
     protected
 
     def missing_attributes(args)
-      ([:connection] | args).select{|arg| send("#{arg}").nil?}
+      ([:service] | args).select{|arg| send("#{arg}").nil?}
     end
 
     def changed!(attribute, from, to)

data/lib/cistern/collection.rb

@@ -1,6 +1,4 @@
-class Cistern::Collection
-  extend Cistern::Attributes::ClassMethods
-  include Cistern::Attributes::InstanceMethods
+module Cistern::Collection
 
   BLACKLISTED_ARRAY_METHODS = [
     :compact!, :flatten!, :reject!, :reverse!, :rotate!, :map!,
@@ -8,15 +6,21 @@ class Cistern::Collection
     :keep_if, :pop, :shift, :delete_at, :compact
   ].to_set # :nodoc:
 
-  attr_accessor :records, :loaded, :connection
+  def self.service_collection(service, klass)
+    plural_name = Cistern::String.underscore(Cistern::String.demodulize(klass.name))
 
-  alias service connection
+    service.const_get(:Collections).module_eval <<-EOS, __FILE__, __LINE__
+      def #{plural_name}(attributes={})
+      #{klass.name}.new(attributes.merge(service: self))
+      end
+    EOS
+  end
 
-  def self.model(new_model=nil)
-    if new_model == nil
-      @model
-    else
-      @model = new_model
+  attr_accessor :records, :loaded, :service
+
+  module ClassMethods
+    def model(new_model=nil)
+      @model ||= new_model
     end
   end
 
@@ -75,7 +79,7 @@ class Cistern::Collection
     model.new(
       {
         :collection => self,
-        :connection => connection,
+        :service    => service,
       }.merge(attributes)
     )
   end

data/lib/cistern/formatter.rb

@@ -7,10 +7,6 @@ module Cistern::Formatter
       Cistern::Formatter::AwesomePrint
     elsif defined?(::Formatador)
       Cistern::Formatter::Formatador
-    else
-      Cistern::Formatter::Default
     end
   end
 end
-
-require 'cistern/formatter/default'

data/lib/cistern/model.rb

@@ -1,13 +1,19 @@
-class Cistern::Model
-  extend Cistern::Attributes::ClassMethods
+module Cistern::Model
   include Cistern::Attributes::InstanceMethods
 
-  attr_accessor :collection, :connection
+  def self.included(klass)
+    klass.send(:extend, Cistern::Attributes::ClassMethods)
+    klass.send(:include, Cistern::Attributes::InstanceMethods)
+  end
 
-  alias service connection
+  attr_accessor :collection, :service
 
   def inspect
-    Cistern.formatter.call(self)
+    if Cistern.formatter
+      Cistern.formatter.call(self)
+    else
+      "#<#{self.class} #{self.identity}"
+    end
   end
 
   def initialize(attributes={})
@@ -50,15 +56,15 @@ class Cistern::Model
     end
   end
 
-  def service
-    self.connection ? self.connection.class : Cistern
+  def wait_for(timeout = self.service_class.timeout, interval = self.service_class.poll_interval, &block)
+    service_class.wait_for(timeout, interval) { reload && block.call(self) }
   end
 
-  def wait_for(timeout = self.service.timeout, interval = self.service.poll_interval, &block)
-    service.wait_for(timeout, interval) { reload && block.call(self) }
+  def wait_for!(timeout = self.service_class.timeout, interval = self.service_class.poll_interval, &block)
+    service_class.wait_for!(timeout, interval) { reload && block.call(self) }
   end
 
-  def wait_for!(timeout = self.service.timeout, interval = self.service.poll_interval, &block)
-    service.wait_for!(timeout, interval) { reload && block.call(self) }
+  def service_class
+    self.service ? self.service.class : Cistern
   end
 end

data/lib/cistern/request.rb

@@ -1,41 +1,28 @@
-class Cistern::Request
-  def self.register(service, klass, method)
-    service.requests << [method, {class: klass, method: method, new: true}]
-  end
+module Cistern::Request
+  def self.service_request(service, klass)
+    request = klass.request_name || Cistern::String.camelize(klass.name)
 
-  def self.service(klass, options={})
-    @service = klass
-    @service_method = options[:method] || Cistern::String.underscore(
-      Cistern::String.demodulize(self.name)
-    )
-    Cistern::Request.register(klass, self, @service_method)
-  end
+    service::Mock.module_eval <<-EOS, __FILE__, __LINE__
+      def #{request}(*args)
+        #{klass}.new(self).mock(*args)
+      end
+    EOS
 
-  def self.service_method
-    @service_method
+    service::Real.module_eval <<-EOS, __FILE__, __LINE__
+      def #{request}(*args)
+        #{klass}.new(self).real(*args)
+      end
+    EOS
   end
 
-  attr_reader :connection
-
-  alias service connection
-
-  def initialize(connection)
-    @connection = connection
-  end
-
-  def _real(*args, &block)
-    real(*args, &block)
-  end
-
-  def _mock(*args, &block)
-    mock(*args, &block)
-  end
+  attr_reader :service
 
-  def real(*args, &block)
-    raise NotImplementedError
+  def initialize(service)
+    @service = service
   end
 
-  def mock(*args, &block)
-    Cistern::Mock.not_implemented(self.class.service_method)
+  module ClassMethods
+    def request_name
+    end
   end
 end

data/lib/cistern/service.rb

@@ -42,6 +42,44 @@ class Cistern::Service
           def initialize(options={})
           end
         end
+
+        class Model
+          include Cistern::Model
+
+          def self.service
+            #{klass.name}
+          end
+        end
+
+        class Collection
+          include Cistern::Collection
+
+          def self.inherited(klass)
+            klass.extend(Cistern::Attributes::ClassMethods)
+            klass.extend(Cistern::Collection::ClassMethods)
+            klass.include(Cistern::Attributes::InstanceMethods)
+
+            Cistern::Collection.service_collection(service, klass)
+          end
+
+          def self.service
+            #{klass.name}
+          end
+        end
+
+        class Request
+          include Cistern::Request
+
+          def self.inherited(klass)
+            klass.extend(Cistern::Request::ClassMethods)
+
+            Cistern::Request.service_request(service, klass)
+          end
+
+          def self.service
+            #{klass.name}
+          end
+        end
       EOS
 
       klass.send(:const_set, :Timeout, Class.new(Cistern::Error))
@@ -57,30 +95,6 @@ class Cistern::Service
       klass::Real.timeout_error = klass::Timeout
     end
 
-    def collection_path(collection_path = nil)
-      if collection_path
-        @collection_path = collection_path
-      else
-        @collection_path
-      end
-    end
-
-    def model_path(model_path = nil)
-      if model_path
-        @model_path = model_path
-      else
-        @model_path
-      end
-    end
-
-    def request_path(request_path = nil)
-      if request_path
-        @request_path = request_path
-      else
-        @request_path
-      end
-    end
-
     def collections
       @collections ||= []
     end
@@ -109,22 +123,10 @@ class Cistern::Service
       self.recognized_arguments.concat(args)
     end
 
-    def model(model_name, options={})
-      models << [model_name, options]
-    end
-
     def mocked_requests
       @mocked_requests ||= []
     end
 
-    def request(request_name, options={})
-      requests << [request_name, options]
-    end
-
-    def collection(collection_name, options={})
-      collections << [collection_name, options]
-    end
-
     def validate_options(options={})
       required_options = Cistern::Hash.slice(options, *required_arguments)
 
@@ -141,91 +143,8 @@ class Cistern::Service
       end
     end
 
-    def setup_requirements
-      @required ||= false
-      unless @required
-
-        # setup models
-        models.each do |model, options|
-          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 #{singular_name}(attributes={})
-              #{service}::#{class_name}.new({connection: self}.merge(attributes))
-            end
-          EOS
-        end
-
-        # setup requests
-        requests.each do |request, options|
-          unless (options[:require] == false) || options[:new] || service::Real.method_defined?(request.to_s)
-            require(options[:require] || File.join(@request_path, request.to_s))
-          end
-
-          if options[:new]
-            klass  = options.fetch(:class)
-            method = options.fetch(:method)
-
-            unless klass.instance_methods.include?(:mock)
-              klass.class_eval <<-EOS, __FILE__, __LINE__
-                def #{method}(*args)
-                  Cistern::Mock.not_implemented(request)
-                end
-              EOS
-            end
-
-            service::Real.module_eval <<-EOS, __FILE__, __LINE__
-              def #{method}(*args)
-                #{klass}.new(self)._real(*args)
-              end
-            EOS
-
-            service::Mock.module_eval <<-EOS, __FILE__, __LINE__
-              def #{method}(*args)
-                #{klass}.new(self)._mock(*args)
-              end
-            EOS
-          elsif service::Mock.method_defined?(request)
-            mocked_requests << request
-          else
-            service::Mock.module_eval <<-EOS, __FILE__, __LINE__
-              def #{request}(*args)
-                Cistern::Mock.not_implemented(request)
-              end
-            EOS
-          end
-        end
-
-        # setup collections
-        collections.each do |collection, options|
-          unless false == options[:require]
-            require(options[:require] || File.join(@collection_path || @model_path, collection.to_s))
-          end
-
-          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 #{plural_name}(attributes={})
-              #{service}::#{class_name}.new({connection: self}.merge(attributes))
-            end
-          EOS
-        end
-
-        @required = true
-      end
-    end
-
     def new(options={})
       validate_options(options)
-      setup_requirements
 
       self.const_get(self.mocking? ? :Mock : :Real).new(options)
     end

data/lib/cistern/singular.rb

@@ -2,7 +2,7 @@ class Cistern::Singular
   extend Cistern::Attributes::ClassMethods
   include Cistern::Attributes::InstanceMethods
 
-  attr_accessor :connection
+  attr_accessor :service
 
   def inspect
     if Cistern.formatter

data/lib/cistern/string.rb

@@ -1,5 +1,20 @@
 class Cistern::String
-  # stolen from activesupport/lib/active_support/inflector/methods.rb, line 198
+  def self.camelize(string)
+    string.gsub(/[A-Z]+/) { |w| "_#{w.downcase}" }.gsub(/^_/, "")
+  end
+
+  # File activesupport/lib/active_support/inflector/methods.rb, line 90
+  def self.underscore(camel_cased_word)
+    word = camel_cased_word.to_s.gsub('::', '/')
+    #word.gsub!(/(?:([A-Za-z\d])|^)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1}#{$1 && '_'}#{$2.downcase}" }
+    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
+  end
+
+  # File activesupport/lib/active_support/inflector/methods.rb, line 168
   def self.demodulize(path)
     path = path.to_s
     if i = path.rindex('::')
@@ -9,15 +24,8 @@ class Cistern::String
     end
   end
 
-  # stolen from activesupport/lib/active_support/inflector/methods.rb, line 90
-  def self.underscore(camel_cased_word)
-    return camel_cased_word unless camel_cased_word =~ /[A-Z-]|::/
-    word = camel_cased_word.to_s.gsub(/::/, '/')
-    #word.gsub!(/(?:(?<=([A-Za-z\d]))|\b)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1 && '_'}#{$2.downcase}" }
-    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-    word.tr!("-", "_")
-    word.downcase!
-    word
+  # @todo omg so bad
+  def self.pluralize(string)
+    "#{string}s"
   end
 end

data/lib/cistern/version.rb

@@ -1,3 +1,3 @@
 module Cistern
-  VERSION = "0.12.3"
+  VERSION = "1.0.0.pre"
 end

data/spec/collection_spec.rb

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

data/spec/dirty_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Cistern::Model#dirty" do
-  class DirtySpec < Cistern::Model
+  class DirtySpec < Sample::Model
     identity :id
 
     attribute :name

data/spec/formatter_spec.rb

@@ -1,75 +1,41 @@
 require 'spec_helper'
 
-class Inspector < Cistern::Model
-  identity :id
-  attribute :name
-end
-
-class Anon < Cistern::Model
-  attribute :chan
-end
-
-class Inspectors < Cistern::Collection
-  model Inspector
-
-  def all(options={})
-    merge_attributes(options)
-    self.load([{id: 1, name: "2"},{id: 3, name: "4"}])
-  end
-end
-
-describe Cistern::Formatter::Default do
-  before { Cistern.formatter = described_class }
-
-  it "formats a model" do
-    expect(
-      Inspector.new(id: 1, name: "name").inspect
-    ).to match(
-      /<Inspector:0x[a-z0-9]+> {:id=>1, :name=>\"name\"}/
-    )
-
-    Anon.inspect
-  end
-
-  it "formats a collection" do
-    expect(
-      Inspectors.new.all.inspect
-    ).to match(
-      /<Inspectors:0x[a-z0-9]+> {} records/
-    )
+describe "#inspect" do
+  class Inspector < Sample::Model
+    identity :id
+    attribute :name
   end
-end
 
-describe Cistern::Formatter::AwesomePrint do
-  before { Cistern.formatter = described_class }
+  class Inspectors < Sample::Collection
+    model Inspector
 
-  it "formats a model" do
-    expect(
-      Inspector.new(id: 1, name: "name").inspect
-    ).to match(
-      /(?x-mi:\#<Inspector:0x[0-9a-f]+>\ {\n\ \ \ \ \ \ :id\x1B\[0;37m\ =>\ \x1B\[0m\x1B\[1;34m1\x1B\[0m,\n\ \ \ \ :name\x1B\[0;37m\ =>\ \x1B\[0m\x1B\[0;33m"name"\x1B\[0m\n})/
-    )
+    def all(options={})
+      merge_attributes(options)
+      self.load([{id: 1, name: "2"},{id: 3, name: "4"}])
+    end
   end
 
-  it "formats a collection" do
-    expect(Inspectors.new.all.inspect).to match(/Inspectors\s+{.*}$/m) # close enough
-  end
-end
+  describe "Cistern::Model" do
+    it "should use awesome_print" do
+      Cistern.formatter = Cistern::Formatter::AwesomePrint
 
-describe Cistern::Formatter::Formatador do
-  before { Cistern.formatter = described_class }
+      Inspector.new(id: 1, name: "name").inspect.match /(?x-mi:\#<Inspector:0x[0-9a-f]+>\ {\n\ \ \ \ \ \ :id\x1B\[0;37m\ =>\ \x1B\[0m\x1B\[1;34m1\x1B\[0m,\n\ \ \ \ :name\x1B\[0;37m\ =>\ \x1B\[0m\x1B\[0;33m"name"\x1B\[0m\n})/
+    end
 
-  it "formats a model" do
-    Cistern.formatter = Cistern::Formatter::Formatador
+    it "should use formatador" do
+      Cistern.formatter = Cistern::Formatter::Formatador
 
-    expect(Inspector.new(id: 1, name: "name").inspect).to eq(%q{  <Inspector
+      expect(Inspector.new(id: 1, name: "name").inspect).to eq(%q{  <Inspector
     id=1,
     name="name"
   >})
+    end
   end
 
-  it "formats a collection" do
-    expect(Inspectors.new.all.inspect).to eq(%q{  <Inspectors
+  describe "Cistern::Collection" do
+    it "should use formatador" do
+      Cistern.formatter = Cistern::Formatter::Formatador
+      expect(Inspectors.new.all.inspect).to eq(%q{  <Inspectors
     [
       <Inspector
         id=1,
@@ -81,5 +47,11 @@ describe Cistern::Formatter::Formatador do
       >
     ]
   >})
+    end
+
+    it "should use awesome_print" do
+      Cistern.formatter = Cistern::Formatter::AwesomePrint
+      expect(Inspectors.new.all.inspect).to match(/Inspectors\s+{.*}$/m) # close enough
+    end
   end
 end

data/spec/mock_data_spec.rb

@@ -1,37 +1,31 @@
 require 'spec_helper'
 
 describe 'mock data' do
-  class Patient < Cistern::Service
-    request :diagnosis
-    request :treat
-
-    class Real
-      def diagnosis(options={})
-      end
+  class Diagnosis < Sample::Request
+    def real(diagnosis)
+    end
 
-      def treat(options={})
-      end
+    def mock(diagnosis)
+      service.data.store(:diagnosis, service.data.fetch(:diagnosis) + [diagnosis])
     end
+  end
 
-    class Mock
-      def diagnosis(diagnosis)
-        #self.data[:diagnosis] << rand(2) == 0 ? "sick" : "healthy"
-        self.data.store(:diagnosis, self.data.fetch(:diagnosis) + [diagnosis])
-      end
+  class Treat < Sample::Request
+    def real(treatment)
+    end
 
-      def treat(treatment)
-        self.data[:treatments] += [treatment]
-      end
+    def mock(treatment)
+      service.data[:treatments] += [treatment]
     end
   end
 
   shared_examples "mock_data#backend" do |backend, options|
     it "should store mock data" do
-      Patient.mock!
-      Patient::Mock.store_in(backend, options)
-      Patient.reset!
+      Sample.mock!
+      Sample::Mock.store_in(backend, options)
+      Sample.reset!
 
-      p = Patient.new
+      p = Sample.new
       p.diagnosis("sick")
       expect(p.data[:diagnosis]).to eq(["sick"])
 
@@ -42,7 +36,7 @@ describe 'mock data' do
       p.treat("healthy")
       expect(p.data[:treatments]).to eq(["healthy"])
 
-      Patient.reset!
+      Sample.reset!
 
       expect(p.data[:treatments]).to eq([])
     end

data/spec/model_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Cistern::Model" do
   describe "#update" do
-    class UpdateSpec < Cistern::Model
+    class UpdateSpec < Sample::Model
       identity :id
       attribute :name
       attribute :properties
@@ -21,7 +21,7 @@ describe "Cistern::Model" do
   end
 
   it "should duplicate a model" do
-    class DupSpec < Cistern::Model
+    class DupSpec < Sample::Model
       identity :id
       attribute :name
       attribute :properties
@@ -38,7 +38,7 @@ describe "Cistern::Model" do
   end
 
   context "attribute parsing" do
-    class TypeSpec < Cistern::Model
+    class TypeSpec < Sample::Model
       identity :id
       attribute :name, type: :string
       attribute :created_at, type: :time
@@ -155,17 +155,17 @@ describe "Cistern::Model" do
 
     describe "#requires" do
       it "should raise if attribute not provided" do
-        expect { TypeSpec.new({"connection" => "fake", "something" => {"id" => "12"}}).save }.to raise_exception(ArgumentError)
+        expect { TypeSpec.new({"service" => "fake", "something" => {"id" => "12"}}).save }.to raise_exception(ArgumentError)
       end
 
       it "should raise if attribute is provided and is nil" do
-        expect { TypeSpec.new({"connection" => "fake", "custom" => nil}).save }.to raise_exception(ArgumentError)
+        expect { TypeSpec.new({"service" => "fake", "custom" => nil}).save }.to raise_exception(ArgumentError)
       end
     end
   end
 
   context "attribute coverage info collecting", :coverage do
-    class CoverageSpec < Cistern::Model
+    class CoverageSpec < Sample::Model
       identity :id
 
       attribute :used, type: :string

data/spec/request_spec.rb

@@ -1,29 +1,37 @@
 require 'spec_helper'
 
-describe Cistern do
+describe "Cistern::Request" do
   class SampleService < Cistern::Service
+    recognizes :key
+
     class Real
+      attr_reader :service_args
+
+      def initialize(*args)
+        @service_args = args
+      end
     end
   end
 
-  class SampleService::GetSample < Cistern::Request
-    service SampleService
-
+  # @todo Sample::Service.request
+  class ListSamples < SampleService::Request
+    # @todo name
+    # name :list_all_samples
     def real(*args)
-      args
+      service.service_args + args + ["real"]
     end
-  end
 
-  class ShowSamples < Cistern::Request
-    service SampleService, method: :list_samples
-
-    def real(*args)
-      {"samples" => args}
+    def mock(*args)
+      args + ["mock"]
     end
   end
 
-  it "allows requests to be created in a forward compatible structure" do
-    expect(SampleService.new.get_sample("likewhoa")).to   contain_exactly("likewhoa")
-    expect(SampleService.new.list_samples("likewhoa")).to eq("samples" => ["likewhoa"])
+  it "should execute a new-style request" do
+    expect(SampleService.new.list_samples("sample1")).to eq([{}, "sample1", "real"])
+    expect(SampleService::Real.new.list_samples("sample2")).to eq(["sample2", "real"])
+    expect(SampleService::Mock.new.list_samples("sample3")).to eq(["sample3", "mock"])
+
+    # service access
+    expect(SampleService.new(:key => "value").list_samples("stat")).to eq([{:key => "value"}, "stat", "real"])
   end
 end

data/spec/singular_spec.rb

@@ -6,8 +6,8 @@ describe "Cistern::Singular" do
     attribute :count, type: :number
 
     def fetch_attributes
-      #test that initialize waits for connection to be defined
-      raise "missing connection" unless connection
+      #test that initialize waits for service to be defined
+      raise "missing service" unless service
 
       @counter ||= 0
       @counter += 1
@@ -16,11 +16,11 @@ describe "Cistern::Singular" do
   end
 
   it "should work" do
-    expect(SampleSingular.new(connection: :fake).name).to eq("amazing")
+    expect(SampleSingular.new(service: :fake).name).to eq("amazing")
   end
 
   it "should reload" do
-    singular = SampleSingular.new(connection: :fake)
+    singular = SampleSingular.new(service: :fake)
     old_count = singular.count
     expect(singular.count).to eq(old_count)
     expect(singular.reload.count).to be > old_count

data/spec/spec_helper.rb

@@ -4,10 +4,13 @@ if ENV["TRAVIS"]
 end
 
 require File.expand_path('../../lib/cistern', __FILE__)
+Dir[File.expand_path("../{support,shared,matchers,fixtures}/*.rb", __FILE__)].each{|f| require(f)}
 
 Bundler.require(:test)
 
 RSpec.configure do |c|
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+
   if Kernel.respond_to?(:caller_locations)
     require File.expand_path('../../lib/cistern/coverage', __FILE__)
   else

data/spec/support/service.rb

@@ -0,0 +1 @@
+class Sample < Cistern::Service; end

data/spec/wait_for_spec.rb

@@ -1,23 +1,13 @@
 require 'spec_helper'
 
-class WaitForService < Cistern::Service
-  model :wait_for_model, require: false
-  collection :wait_for_models, require: false
-
-  class Real
-    def initialize(*args)
-    end
-  end
-end
-
-class WaitForService::WaitForModel < Cistern::Model
+class WaitForModel < Sample::Model
   identity :id
 
   attribute :name
 end
 
-class WaitForService::WaitForModels < Cistern::Collection
-  model WaitForService::WaitForModel
+class WaitForModels < Sample::Collection
+  model WaitForModel
 
   def get(identity)
     self
@@ -37,17 +27,17 @@ describe 'Cistern#wait_for!' do
 end
 
 describe 'Cistern::Model#wait_for!' do
-  let(:service) { WaitForService.new }
+  let(:service) { Sample.new }
   let(:model)   { service.wait_for_models.new(identity: 1) }
 
   it "should raise if timeout exceeded" do
-    expect { model.wait_for!(0, 0) { false } }.to raise_exception(WaitForService::Timeout)
+    expect { model.wait_for!(0, 0) { false } }.to raise_exception(Sample::Timeout)
   end
 end
 
 
 describe "WaitForModel#timeout" do
-  let(:service) { WaitForService.new }
+  let(:service) { Sample.new }
   let(:model)   { service.wait_for_models.new(identity: 1) }
 
   it "should use service-specific timeout in #wait_for" do
@@ -59,7 +49,7 @@ describe "WaitForModel#timeout" do
     timeout(2) do
       expect do
         model.wait_for! { sleep(0.2); elapsed += 0.2; elapsed > 0.2 }
-      end.to raise_exception(WaitForService::Timeout)
+      end.to raise_exception(Sample::Timeout)
     end
   end
 
@@ -72,7 +62,7 @@ describe "WaitForModel#timeout" do
     timeout(2) do
       expect do
         model.wait_for!(0.1) { sleep(0.2); elapsed += 0.2; elapsed > 0.2 }
-      end.to raise_exception(WaitForService::Timeout)
+      end.to raise_exception(Sample::Timeout)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 1.0.0.pre
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email:
@@ -17,7 +17,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemrelease"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -36,7 +35,6 @@ files:
 - lib/cistern/data/redis.rb
 - lib/cistern/formatter.rb
 - lib/cistern/formatter/awesome_print.rb
-- lib/cistern/formatter/default.rb
 - lib/cistern/formatter/formatador.rb
 - lib/cistern/hash.rb
 - lib/cistern/mock.rb
@@ -55,8 +53,10 @@ files:
 - spec/mock_data_spec.rb
 - spec/model_spec.rb
 - spec/request_spec.rb
+- spec/service_spec.rb
 - spec/singular_spec.rb
 - spec/spec_helper.rb
+- spec/support/service.rb
 - spec/wait_for_spec.rb
 homepage: http://joshualane.com/cistern
 licenses:
@@ -73,12 +73,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: API client framework
@@ -90,6 +90,9 @@ test_files:
 - spec/mock_data_spec.rb
 - spec/model_spec.rb
 - spec/request_spec.rb
+- spec/service_spec.rb
 - spec/singular_spec.rb
 - spec/spec_helper.rb
+- spec/support/service.rb
 - spec/wait_for_spec.rb
+has_rdoc: 

data/.gemrelease

@@ -1,3 +0,0 @@
----
-bump:
-  tag: true

data/lib/cistern/formatter/default.rb

@@ -1,22 +0,0 @@
-module Cistern::Formatter::Default
-  class << self
-    def call(object)
-      case object
-      when Cistern::Collection
-        format_collection(object)
-      when Cistern::Model
-        format_model(object)
-      else
-        object.to_s
-      end
-    end
-
-    def format_model(model)
-      "#{model.to_s} #{model.attributes.inspect}"
-    end
-
-    def format_collection(collection)
-      "#{collection.to_s} #{collection.attributes.inspect} records=[#{collection.records.map { |m| format_model(m) }.join(", ")}]"
-    end
-  end
-end