juvet 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ac5e5b95d6312d763f506e3ba5e5d60ae2da66a
-  data.tar.gz: 728de00cdd354de2f413f893e4f5c78aae180f06
+  metadata.gz: 7d3483a72f0e396a5f010a3ad73f5a1d888e89d2
+  data.tar.gz: 551045f13d3322dd05a2a1bd6574e9d32f37e07b
 SHA512:
-  metadata.gz: e42c4c453fddc8fecfbfc6a7974fd8bd8d6b427ee601fd151393850eb65d4e05d1096227abd76780a20c2f306346d2ff5067dc469abe042529a368e8c42c2ef1
-  data.tar.gz: 3ec51c75ca8e74654b86c2a31da27a58ccd5a272c08c976b766bd7de8440e5da316c7e091223a6a6ef30dc4122260a6c46744ddd5fc102f8c19d6917f43065e6
+  metadata.gz: 1dcd42919b068c0e841e1f7fa4052f6c5323f9d6071fb70b142dce80908f25835cd05661738cb9a2fdcd697c4ab4a09d0c8c1aee80f12f2c0cd657aa39c0e628
+  data.tar.gz: bd7ad250abe13a6c48caa4e0ec24d80090c669a5c86937f3faaaef49076c11ecadb398cb45eeda81a1927fffbf574e362421cbe11982e95576c501b81b655aa0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    juvet (0.0.3)
+    juvet (0.0.4)
       redis
 
 GEM

data/README.md

@@ -19,7 +19,7 @@ Juvet.configure do
   adapter :redis, url: ENV["REDIS_URL"]
   mapping do
     collection :bots do
-      repository Juvet::BotRepository
+      repository Juvet::BotRepository, adapter: :redis
       entity Juvet::Bot
     end
   end

data/lib/juvet/attributable.rb

@@ -1,10 +1,5 @@
 module Juvet
   module Attributable
-    def initialize(attributes={})
-      initialize! attributes
-      attribute! attributes
-    end
-
     def initialize!(attributes)
       attributes.each { |name, value| set_variable! name, value }
     end
@@ -26,6 +21,11 @@ module Juvet
 
     private
 
+    def initialize(attributes={})
+      initialize! attributes
+      attribute! attributes
+    end
+
     def create_method(name, &block)
       self.class.send(:define_method, name, &block)
     end

data/lib/juvet/bot.rb

@@ -6,7 +6,7 @@ module Juvet
 
     class << self
       def create(id, attributes={})
-        new id, attributes
+        new attributes.merge(id: id)
       end
 
       def create!(id, attributes={})
@@ -25,12 +25,5 @@ module Juvet
     def update!(attributes={})
       BotRepository.update self
     end
-
-    private
-
-    def initialize(id, attributes={})
-      @id = id
-      super attributes
-    end
   end
 end

data/lib/juvet/configuration/adapter.rb

@@ -5,35 +5,26 @@ module Juvet
       attr_reader :options
       attr_reader :type
 
-      def initialize(options={})
-        opts = default_options.merge((options || {}))
+      def initialize(type=nil, options={})
+        opts = (options || {}).dup
 
-        @type = opts.delete :type
+        @type = type || :null
         @options = opts
-        @class_name = Juvet::String.new("#{type}_adapter").classify
+        @class_name = Juvet::String.new("#{self.type}_adapter").classify
       end
 
-      def build(mapper)
+      def build
         load_adapter
-        instantiate_adapter mapper
+        Juvet::Adapters.const_get(class_name)
       end
 
       private
 
-      def default_options
-        { type: :null }.freeze
-      end
-
       def load_adapter
         require "juvet/adapters/#{type}_adapter"
       rescue LoadError => e
         raise LoadError.new("Cannot find Juvet adapter '#{type}' (#{e.message})")
       end
-
-      def instantiate_adapter(mapper)
-        klass = Juvet::Adapters.const_get(class_name)
-        klass.new(mapper.collection_for_repository(klass), options)
-      end
     end
   end
 end

data/lib/juvet/configuration/mapping.rb

@@ -7,8 +7,10 @@ module Juvet
         @block = block
       end
 
-      def build
-        Juvet::Mapper.new &@block
+      def build(adapter)
+        mapper = Juvet::Mapper.new &@block
+        mapper.build(adapter)
+        mapper
       end
     end
   end

data/lib/juvet/configuration.rb

@@ -3,8 +3,9 @@ require_relative "configuration/mapping"
 
 module Juvet
   class Configuration
-    def adapter(options=nil)
-      @adapter ||= Juvet::Configuration::Adapter.new(options)
+    def adapter(type=nil, options=nil)
+      return @adapter if type.nil?
+      @adapter ||= Juvet::Configuration::Adapter.new(type, options)
     end
 
     def mapping(&block)
@@ -12,7 +13,7 @@ module Juvet
     end
 
     def load!
-      adapter.build mapping.build
+      mapping.build adapter
     end
   end
 end

data/lib/juvet/mapper/collection.rb

@@ -1,3 +1,5 @@
+require_relative "mapped_repository"
+
 module Juvet
   class Mapper
     class Collection
@@ -16,9 +18,9 @@ module Juvet
         end
       end
 
-      def repository(klass=nil)
+      def repository(klass=nil, options=nil)
         if klass
-          @repository = klass
+          @repository = MappedRepository.new klass, options
         else
           @repository
         end

data/lib/juvet/mapper/mapped_repository.rb

@@ -0,0 +1,12 @@
+module Juvet
+  class Mapper
+    class MappedRepository
+      attr_reader :klass, :adapter
+
+      def initialize(klass, options=nil)
+        @klass = klass
+        @adapter = (options || {}).fetch(:adapter) { :null }
+      end
+    end
+  end
+end

data/lib/juvet/mapper.rb

@@ -14,8 +14,13 @@ module Juvet
       collections[name] = Juvet::Mapper::Collection.new name, &block
     end
 
-    def collection_for_repository(klass)
-      collections.values.find { |collection| collection.repository == klass }
+    def build(adapter)
+      collections.each_pair do |name, collection|
+        if collection.repository && collection.repository.adapter == adapter.type
+          adapter_instance = adapter.build.new collection, adapter.options
+          collection.repository.klass.adapter = adapter_instance
+        end
+      end
     end
   end
 end

data/lib/juvet/version.rb

@@ -1,3 +1,3 @@
 module Juvet
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/juvet/configuration/adapter_spec.rb

@@ -1,26 +1,26 @@
 describe Juvet::Configuration::Adapter do
   describe "#type" do
     it "sets the type from the options" do
-      subject = described_class.new type: :null
+      subject = described_class.new :null
       expect(subject.type).to eq :null
     end
   end
 
   describe "#options" do
     it "includes any additional options initialized" do
-      subject = described_class.new type: :nil, blah: :bleh
+      subject = described_class.new :null, blah: :bleh
       expect(subject.options).to eq({ blah: :bleh })
     end
   end
 
   describe "#class_name" do
     it "creates a class name from the type" do
-      subject = described_class.new type: :null
+      subject = described_class.new :null
       expect(subject.class_name).to eq "NullAdapter"
     end
   end
 
-  describe "default options" do
+  describe "default type" do
     it "has a null adapter type" do
       expect(described_class.new.type).to eq :null
       expect(described_class.new.class_name).to eq "NullAdapter"
@@ -28,19 +28,22 @@ describe Juvet::Configuration::Adapter do
   end
 
   describe "#build" do
-    let(:mapper) { double(:mapper, collection_for_repository: nil) }
-    subject { described_class.new type: :null }
+    subject { described_class.new :redis }
 
-    it "creates an instance of the adapter" do
-      adapter = subject.build mapper
+    it "loads the adapter" do
+      subject.build
+      expect { Juvet::Adapters::RedisAdapter }.to_not raise_error
+    end
 
-      expect(adapter).to be_instance_of Juvet::Adapters::NullAdapter
+    it "returns the class name for the adapter" do
+      klass = subject.build
+      expect(klass).to eq Juvet::Adapters::RedisAdapter
     end
 
-    it "returns a load error if the adapter type cannot be loaded" do
-      subject = described_class.new type: :blah
+    it "raises a load error if the adapter type cannot be loaded" do
+      subject = described_class.new :blah
 
-      expect { subject.build(mapper) }.to raise_error LoadError
+      expect { subject.build }.to raise_error LoadError
     end
   end
 end

data/spec/juvet/configuration/mapping_spec.rb

@@ -6,10 +6,11 @@ describe Juvet::Configuration::Mapping do
         end
       }
     end
+    let(:adapter) { Juvet::Configuration::Adapter.new :null }
     subject { described_class.new &blk }
 
     it "creates a mapper from a block" do
-      result = subject.build
+      result = subject.build adapter
 
       expect(result).to be_an_instance_of Juvet::Mapper
       expect(result.collections.length).to eq 1

data/spec/juvet/configuration_spec.rb

@@ -2,7 +2,7 @@ describe Juvet::Configuration do
   subject { described_class.new }
 
   it "has a default repository adapter" do
-    expect(subject.adapter).to be_instance_of Juvet::Configuration::Adapter
+    expect(subject.adapter(:null)).to be_instance_of Juvet::Configuration::Adapter
   end
 
   it "has a default mapping" do
@@ -13,12 +13,8 @@ describe Juvet::Configuration do
     subject { described_class.new }
 
     it "builds the mapping" do
-      expect(subject.mapping).to receive(:build).and_call_original
-      subject.load!
-    end
-
-    it "builds the adapter" do
-      expect(subject.adapter).to receive(:build).with(Juvet::Mapper)
+      subject.adapter :null
+      expect(subject.mapping).to receive(:build).with(subject.adapter)
       subject.load!
     end
   end

data/spec/juvet/mapper/collection_spec.rb

@@ -9,11 +9,12 @@ describe Juvet::Mapper::Collection do
     it "executes the block if one is provided" do
       subject = described_class.new(:widgets) do
         entity Object
-        repository Object
+        repository Object, adapter: :blah
       end
 
       expect(subject.entity).to eq Object
-      expect(subject.repository).to eq Object
+      expect(subject.repository.klass).to eq Object
+      expect(subject.repository.adapter).to eq :blah
     end
   end
 end

data/spec/juvet/mapper/mapped_repository_spec.rb

@@ -0,0 +1,13 @@
+describe Juvet::Mapper::MappedRepository do
+  describe "#initialize" do
+    it "extracts the adapter from the options" do
+      subject = described_class.new Object, adapter: :blah
+      expect(subject.adapter).to eq :blah
+    end
+
+    it "defaults to the null adapter if it's not specified" do
+      subject = described_class.new Object
+      expect(subject.adapter).to eq :null
+    end
+  end
+end

data/spec/juvet/mapper_spec.rb

@@ -10,19 +10,10 @@ describe Juvet::Mapper do
     end
   end
 
-  describe "#collection" do
-    subject { described_class.new }
-
-    it "adds a collection with the block" do
-      subject.collection(:widgets) do; end
-
-      expect(subject.collections[:widgets]).to \
-        be_instance_of Juvet::Mapper::Collection
+  describe "#build" do
+    class WidgetRepository
+      include Juvet::Repository
     end
-  end
-
-  describe "#collection_for_repository" do
-    class WidgetRepository; end
     let(:subject) do
       described_class.new do
         collection :widgets do
@@ -31,17 +22,20 @@ describe Juvet::Mapper do
       end
     end
 
-    it "returns the collection for the first one that specifies the repository" do
-      result = subject.collection_for_repository WidgetRepository
-
-      expect(result.name).to eq :widgets
-      expect(result.repository).to eq WidgetRepository
+    it "sets the adapter on the repositories" do
+      expect(WidgetRepository).to receive(:adapter=).with(Juvet::Adapters::NullAdapter)
+      subject.build Juvet::Configuration::Adapter.new :null
     end
+  end
 
-    it "returns nil if the repository is not found" do
-      result = subject.collection_for_repository Object
+  describe "#collection" do
+    subject { described_class.new }
 
-      expect(result).to be_nil
+    it "adds a collection with the block" do
+      subject.collection(:widgets) do; end
+
+      expect(subject.collections[:widgets]).to \
+        be_instance_of Juvet::Mapper::Collection
     end
   end
 end

data/spec/juvet_spec.rb

@@ -19,9 +19,10 @@ describe Juvet do
 
     it "sets up the adapter" do
       described_class.configure do
-        adapter type: :null, blah: "blah"
+        adapter :null, blah: "blah"
       end
-      expect(described_class.configuration.adapter).to be_instance_of Juvet::Configuration::Adapter
+      expect(described_class.configuration.adapter).to \
+        be_instance_of Juvet::Configuration::Adapter
       expect(described_class.configuration.adapter.type).to eq :null
       expect(described_class.configuration.adapter.options).to eq({ blah: "blah" })
       expect(described_class.configuration.adapter.class_name).to eq "NullAdapter"
@@ -32,7 +33,8 @@ describe Juvet do
         mapping do
         end
       end
-      expect(described_class.configuration.mapping).to be_instance_of Juvet::Configuration::Mapping
+      expect(described_class.configuration.mapping).to \
+        be_instance_of Juvet::Configuration::Mapping
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: juvet
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jamie Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -52,6 +52,7 @@ files:
 - lib/juvet/entity_not_found_error.rb
 - lib/juvet/mapper.rb
 - lib/juvet/mapper/collection.rb
+- lib/juvet/mapper/mapped_repository.rb
 - lib/juvet/repository.rb
 - lib/juvet/string.rb
 - lib/juvet/version.rb
@@ -63,6 +64,7 @@ files:
 - spec/juvet/configuration/mapping_spec.rb
 - spec/juvet/configuration_spec.rb
 - spec/juvet/mapper/collection_spec.rb
+- spec/juvet/mapper/mapped_repository_spec.rb
 - spec/juvet/mapper_spec.rb
 - spec/juvet/repository_spec.rb
 - spec/juvet/string_spec.rb
@@ -101,6 +103,7 @@ test_files:
 - spec/juvet/configuration/mapping_spec.rb
 - spec/juvet/configuration_spec.rb
 - spec/juvet/mapper/collection_spec.rb
+- spec/juvet/mapper/mapped_repository_spec.rb
 - spec/juvet/mapper_spec.rb
 - spec/juvet/repository_spec.rb
 - spec/juvet/string_spec.rb