cistern 0.11.2.pre2 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fd7d5118bf1337d421cb49d37ec448c99a6a348
-  data.tar.gz: 3eb9da77dd49b2fdca439c4d0112af1ecf3e0d36
+  metadata.gz: 3ae50687387de9d226da400b9d56bf97f2ecddc4
+  data.tar.gz: 93febb3647951b17b4aa0f076e4610d022db788b
 SHA512:
-  metadata.gz: 26f8cf18cabc2699cd6b8e1ab18628408254e9ad3dc3d992cf923b322c3fae6bfc5b1406decb255ba969031fd98ea03d7eb39780915d4cd97048d46e9bcbead3
-  data.tar.gz: 36f14d5bfbfae722156cd722ddae8fe4b5f4028631d98578f56ab2cef8812153d74fc8130cc98c95ee885b831c371554fdbc5da1c865c2f7ad7684fad78d1aa5
+  metadata.gz: 30e2383f0df43ffd95fdee028407993d6eccfba52c27ddece42d5244a7ae5f5608c8106417f519b8bcbf47bb11a5a4fe2ac76acd8e88acf0a01006bdc9171ced
+  data.tar.gz: 00ee7d048ebfc6cec54eea637d8c2da9eb3ce7cfba85513492097058046210de942359c439541fe9e99e6c1ab762827e9d4669f5e5e6a0783282649f71cdff20

data/.gemrelease

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

data/README.md

@@ -208,7 +208,7 @@ Patient::Mock.store_in(:hash)
 
 ### Model
 
-* `service` represents the associated `Foo::Client` instance.
+* `connection` represents the associated `Foo::Client` instance.
 * `collection` represents the related collection (if applicable)
 
 Example
@@ -225,7 +225,7 @@ class Foo::Client::Bar < Cistern::Model
     params  = {
       "id" => self.identity
     }
-    self.service.destroy_bar(params).body["request"]
+    self.connection.destroy_bar(params).body["request"]
   end
 
   def save
@@ -239,11 +239,11 @@ class Foo::Client::Bar < Cistern::Model
     }
 
     if new_record?
-      merge_attributes(service.create_bar(params).body["bar"])
+      merge_attributes(connection.create_bar(params).body["bar"])
     else
       requires :identity
 
-      merge_attributes(service.update_bar(params).body["bar"])
+      merge_attributes(connection.update_bar(params).body["bar"])
     end
   end
 end
@@ -286,7 +286,7 @@ class Foo::Client::Bars < Cistern::Collection
   model Foo::Client::Bar
 
   def all(params = {})
-    response = service.get_bars(params)
+    response = connection.get_bars(params)
 
     data = response.body
 
@@ -300,11 +300,11 @@ class Foo::Client::Bars < Cistern::Collection
     }
     params.merge!("location" => options[:location]) if options.key?(:location)
 
-    service.requests.new(service.discover_bar(params).body["request"])
+    connection.requests.new(connection.discover_bar(params).body["request"])
   end
 
   def get(id)
-    if data = service.get_bar("id" => id).body["bar"]
+    if data = connection.get_bar("id" => id).body["bar"]
       new(data)
     else
       nil

data/lib/cistern/attributes.rb

@@ -173,26 +173,39 @@ 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|
-        key = _key.to_s.to_sym
+        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
+
         # find nested paths
-        value.is_a?(::Hash) && self.class.attributes.each do |name, options|
-          if (options[:squash] || []).first == key.to_s
-            send("#{name}=", {key => value})
+        value.is_a?(::Hash) && class_attributes.each do |name, options|
+          if options[:squash] && options[:squash].first == string_key
+            send("#{name}=", {symbol_key => value})
           end
         end
 
-        unless self.class.ignored_attributes.include?(key)
-          if self.class.aliases.has_key?(key)
-            self.class.aliases[key].each do |aliased_key|
+        unless ignored_attributes.include?(symbol_key)
+          if class_aliases.has_key?(symbol_key)
+            class_aliases[symbol_key].each do |aliased_key|
               send("#{aliased_key}=", value)
             end
           end
 
-          protected_methods = Cistern::Model.instance_methods - [:service, :identity, :collection]
-
-          if !protected_methods.include?(key) && self.respond_to?("#{key}=", true)
-            send("#{key}=", value)
+          assignment_method = "#{string_key}="
+          if !protected_methods.include?(symbol_key) && self.respond_to?(assignment_method, true)
+            send(assignment_method, value)
           end
         end
       end
@@ -236,7 +249,7 @@ module Cistern::Attributes
     protected
 
     def missing_attributes(args)
-      ([:service] | args).select{|arg| send("#{arg}").nil?}
+      ([:connection] | args).select{|arg| send("#{arg}").nil?}
     end
 
     def changed!(attribute, from, to)

data/lib/cistern/collection.rb

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

data/lib/cistern/model.rb

@@ -1,12 +1,8 @@
-module Cistern::Model
+class Cistern::Model
+  extend Cistern::Attributes::ClassMethods
   include Cistern::Attributes::InstanceMethods
 
-  def self.included(klass)
-    klass.send(:extend, Cistern::Attributes::ClassMethods)
-    klass.send(:include, Cistern::Attributes::InstanceMethods)
-  end
-
-  attr_accessor :collection, :service
+  attr_accessor :collection, :connection
 
   def inspect
     if Cistern.formatter
@@ -56,15 +52,15 @@ module Cistern::Model
     end
   end
 
-  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) }
+  def service
+    self.connection ? self.connection.class : Cistern
   end
 
-  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) }
+  def wait_for(timeout = self.service.timeout, interval = self.service.poll_interval, &block)
+    service.wait_for(timeout, interval) { reload && block.call(self) }
   end
 
-  def service_class
-    self.service ? self.service.class : Cistern
+  def wait_for!(timeout = self.service.timeout, interval = self.service.poll_interval, &block)
+    service.wait_for!(timeout, interval) { reload && block.call(self) }
   end
 end

data/lib/cistern/service.rb

@@ -42,44 +42,6 @@ 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))
@@ -95,6 +57,30 @@ 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
@@ -123,10 +109,22 @@ 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)
 
@@ -143,8 +141,66 @@ 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 || service::Real.method_defined?(request.to_s)
+            require(options[:require] || File.join(@request_path, request.to_s))
+          end
+
+          if 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 options[:require] == false
+            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 :service
+  attr_accessor :connection
 
   def inspect
     if Cistern.formatter

data/lib/cistern/version.rb

@@ -1,3 +1,3 @@
 module Cistern
-  VERSION = "0.11.2.pre2"
+  VERSION = "0.11.2"
 end

data/lib/cistern.rb

@@ -9,7 +9,6 @@ module Cistern
   Timeout = Class.new(Error)
 
   require 'cistern/hash'
-  require 'cistern/string'
   require 'cistern/mock'
   require 'cistern/wait_for'
   require 'cistern/attributes'
@@ -17,7 +16,6 @@ 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'

data/spec/collection_spec.rb

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

data/spec/dirty_spec.rb

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

data/spec/formatter_spec.rb

@@ -1,12 +1,13 @@
 require 'spec_helper'
 
 describe "#inspect" do
-  class Inspector < Sample::Model
+  class Inspector < Cistern::Model
     identity :id
     attribute :name
   end
 
-  class Inspectors < Sample::Collection
+  class Inspectors < Cistern::Collection
+
     model Inspector
 
     def all(options={})

data/spec/mock_data_spec.rb

@@ -1,31 +1,37 @@
 require 'spec_helper'
 
 describe 'mock data' do
-  class Diagnosis < Sample::Request
-    def real(diagnosis)
-    end
+  class Patient < Cistern::Service
+    request :diagnosis
+    request :treat
 
-    def mock(diagnosis)
-      service.data.store(:diagnosis, service.data.fetch(:diagnosis) + [diagnosis])
-    end
-  end
+    class Real
+      def diagnosis(options={})
+      end
 
-  class Treat < Sample::Request
-    def real(treatment)
+      def treat(options={})
+      end
     end
 
-    def mock(treatment)
-      service.data[:treatments] += [treatment]
+    class Mock
+      def diagnosis(diagnosis)
+        #self.data[:diagnosis] << rand(2) == 0 ? "sick" : "healthy"
+        self.data.store(:diagnosis, self.data.fetch(:diagnosis) + [diagnosis])
+      end
+
+      def treat(treatment)
+        self.data[:treatments] += [treatment]
+      end
     end
   end
 
   shared_examples "mock_data#backend" do |backend, options|
     it "should store mock data" do
-      Sample.mock!
-      Sample::Mock.store_in(backend, options)
-      Sample.reset!
+      Patient.mock!
+      Patient::Mock.store_in(backend, options)
+      Patient.reset!
 
-      p = Sample.new
+      p = Patient.new
       p.diagnosis("sick")
       expect(p.data[:diagnosis]).to eq(["sick"])
 
@@ -36,7 +42,7 @@ describe 'mock data' do
       p.treat("healthy")
       expect(p.data[:treatments]).to eq(["healthy"])
 
-      Sample.reset!
+      Patient.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 < Sample::Model
+    class UpdateSpec < Cistern::Model
       identity :id
       attribute :name
       attribute :properties
@@ -21,7 +21,7 @@ describe "Cistern::Model" do
   end
 
   it "should duplicate a model" do
-    class DupSpec < Sample::Model
+    class DupSpec < Cistern::Model
       identity :id
       attribute :name
       attribute :properties
@@ -38,7 +38,7 @@ describe "Cistern::Model" do
   end
 
   context "attribute parsing" do
-    class TypeSpec < Sample::Model
+    class TypeSpec < Cistern::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({"service" => "fake", "something" => {"id" => "12"}}).save }.to raise_exception(ArgumentError)
+        expect { TypeSpec.new({"connection" => "fake", "something" => {"id" => "12"}}).save }.to raise_exception(ArgumentError)
       end
 
       it "should raise if attribute is provided and is nil" do
-        expect { TypeSpec.new({"service" => "fake", "custom" => nil}).save }.to raise_exception(ArgumentError)
+        expect { TypeSpec.new({"connection" => "fake", "custom" => nil}).save }.to raise_exception(ArgumentError)
       end
     end
   end
 
   context "attribute coverage info collecting", :coverage do
-    class CoverageSpec < Sample::Model
+    class CoverageSpec < Cistern::Model
       identity :id
 
       attribute :used, type: :string

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 service to be defined
-      raise "missing service" unless service
+      #test that initialize waits for connection to be defined
+      raise "missing connection" unless connection
 
       @counter ||= 0
       @counter += 1
@@ -16,11 +16,11 @@ describe "Cistern::Singular" do
   end
 
   it "should work" do
-    expect(SampleSingular.new(service: :fake).name).to eq("amazing")
+    expect(SampleSingular.new(connection: :fake).name).to eq("amazing")
   end
 
   it "should reload" do
-    singular = SampleSingular.new(service: :fake)
+    singular = SampleSingular.new(connection: :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,7 +4,6 @@ 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)
 

data/spec/wait_for_spec.rb

@@ -1,13 +1,23 @@
 require 'spec_helper'
 
-class WaitForModel < Sample::Model
+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
   identity :id
 
   attribute :name
 end
 
-class WaitForModels < Sample::Collection
-  model WaitForModel
+class WaitForService::WaitForModels < Cistern::Collection
+  model WaitForService::WaitForModel
 
   def get(identity)
     self
@@ -27,17 +37,17 @@ describe 'Cistern#wait_for!' do
 end
 
 describe 'Cistern::Model#wait_for!' do
-  let(:service) { Sample.new }
+  let(:service) { WaitForService.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(Sample::Timeout)
+    expect { model.wait_for!(0, 0) { false } }.to raise_exception(WaitForService::Timeout)
   end
 end
 
 
 describe "WaitForModel#timeout" do
-  let(:service) { Sample.new }
+  let(:service) { WaitForService.new }
   let(:model)   { service.wait_for_models.new(identity: 1) }
 
   it "should use service-specific timeout in #wait_for" do
@@ -49,7 +59,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(Sample::Timeout)
+      end.to raise_exception(WaitForService::Timeout)
     end
   end
 
@@ -62,7 +72,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(Sample::Timeout)
+      end.to raise_exception(WaitForService::Timeout)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 0.11.2.pre2
+  version: 0.11.2
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email:
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gemrelease"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -39,10 +40,8 @@ files:
 - lib/cistern/hash.rb
 - lib/cistern/mock.rb
 - lib/cistern/model.rb
-- lib/cistern/request.rb
 - lib/cistern/service.rb
 - lib/cistern/singular.rb
-- lib/cistern/string.rb
 - lib/cistern/timeout.rb
 - lib/cistern/version.rb
 - lib/cistern/wait_for.rb
@@ -52,11 +51,8 @@ files:
 - spec/hash_spec.rb
 - 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,9 +69,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -89,10 +85,7 @@ test_files:
 - spec/hash_spec.rb
 - 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/lib/cistern/request.rb

@@ -1,28 +0,0 @@
-module Cistern::Request
-  def self.service_request(service, klass)
-    request = klass.request_name || Cistern::String.camelize(klass.name)
-
-    service::Mock.module_eval <<-EOS, __FILE__, __LINE__
-      def #{request}(*args)
-        #{klass}.new(self).mock(*args)
-      end
-    EOS
-
-    service::Real.module_eval <<-EOS, __FILE__, __LINE__
-      def #{request}(*args)
-        #{klass}.new(self).real(*args)
-      end
-    EOS
-  end
-
-  attr_reader :service
-
-  def initialize(service)
-    @service = service
-  end
-
-  module ClassMethods
-    def request_name
-    end
-  end
-end

data/lib/cistern/string.rb

@@ -1,31 +0,0 @@
-class Cistern::String
-  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('::')
-      path[(i+2)..-1]
-    else
-      path
-    end
-  end
-
-  # @todo omg so bad
-  def self.pluralize(string)
-    "#{string}s"
-  end
-end

data/spec/request_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-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
-
-  # @todo Sample::Service.request
-  class ListSamples < SampleService::Request
-    # @todo name
-    # name :list_all_samples
-    def real(*args)
-      service.service_args + args + ["real"]
-    end
-
-    def mock(*args)
-      args + ["mock"]
-    end
-  end
-
-  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/support/service.rb

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