plyushkin 0.0.2 → 0.0.3

data/Gemfile

@@ -4,8 +4,9 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'rspec'
-  gem 'timecop'
-  gem 'pry-nav'
-  gem 'sqlite3'
+  gem 'rspec',   '~> 2.14.1'
+  gem 'timecop', '~> 0.7.1'
+  gem 'pry-nav', '~> 0.2.3'
+  gem 'sqlite3', '~> 1.3.8'
+  gem 'webmock', '~> 1.17.1'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    plyushkin (0.0.1)
+    plyushkin (0.0.3)
       activerecord (~> 3.2.12)
 
 GEM
@@ -18,9 +18,12 @@ GEM
     activesupport (3.2.16)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
+    addressable (2.3.5)
     arel (3.0.3)
     builder (3.0.4)
     coderay (1.1.0)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
     diff-lcs (1.2.5)
     i18n (0.6.9)
     method_source (0.8.2)
@@ -40,10 +43,14 @@ GEM
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
+    safe_yaml (0.9.7)
     slop (3.4.7)
     sqlite3 (1.3.8)
     timecop (0.7.1)
     tzinfo (0.3.38)
+    webmock (1.17.1)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
@@ -51,8 +58,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.3)
   plyushkin!
-  pry-nav
+  pry-nav (~> 0.2.3)
   rake
-  rspec
-  sqlite3
-  timecop
+  rspec (~> 2.14.1)
+  sqlite3 (~> 1.3.8)
+  timecop (~> 0.7.1)
+  webmock (~> 1.17.1)

data/lib/plyushkin.rb

@@ -9,6 +9,7 @@ require path + "/plyushkin/nil_value"
 require path + "/plyushkin/property"
 require path + "/plyushkin/model"
 require path + "/plyushkin/service"
+require path + "/plyushkin/cache"
 require path + "/plyushkin/persistence"
 require path + "/plyushkin/validators/presence"
 require path + "/plyushkin/core_ext/plyushkin_extensions"

data/lib/plyushkin/cache.rb

@@ -0,0 +1,14 @@
+module Plyushkin::Cache
+  class << self
+    def cache
+      @cache ||= Plyushkin::Cache::Stub.new
+    end
+
+    def cache=(value)
+      @cache = value
+    end
+  end
+end
+
+require File.dirname(File.expand_path(__FILE__)) + "/cache/stub"
+require File.dirname(File.expand_path(__FILE__)) + "/cache/rails_cache"

data/lib/plyushkin/cache/rails_cache.rb

@@ -0,0 +1,9 @@
+class Plyushkin::Cache::RailsCache
+  def read(key)
+    Rails.cache.read(key)
+  end
+
+  def write(key, value)
+    Rails.cache.write(key, value)
+  end
+end

data/lib/plyushkin/cache/stub.rb

@@ -0,0 +1,17 @@
+class Plyushkin::Cache::Stub
+  def initialize
+    @cache = {}
+  end
+
+  def write(key, value)
+    @cache[key] = value
+  end
+
+  def read(key)
+    @cache[key]
+  end
+
+  def clear
+    @cache = {}
+  end
+end

data/lib/plyushkin/core_ext/active_record_base.rb

@@ -12,9 +12,10 @@ ActiveRecord::Base.instance_eval do
   end
 
   def initialize_plyushkin
-    class << self 
+    class << self
       def plyushkin_model
-        @plyushkin_model ||= Plyushkin::Model.new(Plyushkin::Service::Stub.new)
+        model_name = name ? name.parameterize : "record"
+        @plyushkin_model ||= Plyushkin::Model.new(Plyushkin::Service.service, model_name, Plyushkin::Cache.cache)
       end
     end
 

data/lib/plyushkin/model.rb

@@ -1,10 +1,13 @@
 class Plyushkin::Model
+  attr_reader :service, :name, :cache
 
-  def initialize(service)
-    @service          = service
-    @types            = {}
+  def initialize(service, name, cache)
+    @service                 = service
+    @types                   = {}
     @ignore_unchanged_values = {}
-    @callbacks        = {}
+    @callbacks               = {}
+    @name                    = name
+    @cache                   = cache
   end
 
   def register(name, type, opts={})
@@ -27,9 +30,4 @@ class Plyushkin::Model
   def ignore_unchanged_values
     @ignore_unchanged_values.dup
   end
-
-  def service
-    @service
-  end
-
 end

data/lib/plyushkin/persistence.rb

@@ -14,17 +14,18 @@ class Plyushkin::Persistence
     (@properties || {}).each do |name, property|
       hash[name] = property.value_hashes
     end
-    model.service.put(id, hash.to_json)
+    model.service.put(model.name, id, hash)
+    model.cache.write(get_key(model.name, id), hash)
   end
 
   def load(id)
     @properties = {}
-    model.service.get(id).each do |name, values| 
+    cached(id).each do |name, values|
       property = Plyushkin::Property.build(name, model.registered_types[name.to_sym], values,
-                                         :callbacks               => @callbacks[name.to_sym],
-                                         :ignore_unchanged_values => @model.ignore_unchanged_values[name.to_sym] )
+                                           :callbacks               => @callbacks[name.to_sym],
+                                           :ignore_unchanged_values => @model.ignore_unchanged_values[name.to_sym] )
       @properties[name.to_sym] = property
-    end
+    end if id
     add_missing_properties
   end
 
@@ -32,17 +33,30 @@ class Plyushkin::Persistence
     @callbacks[name] = { callback => block }
   end
 
-  private 
+  private
   def model
     @model
   end
 
+  def cached(id)
+    data = model.cache.read(get_key(model.name, id))
+    unless data
+      data = model.service.get(model.name, id)
+      model.cache.write(get_key(model.name, id), data) if data
+    end
+    data
+  end
+
+  def get_key(name, id)
+    "plyushkin.#{name}.#{id}"
+  end
+
   def add_missing_properties
     (model.registered_types.keys - @properties.keys).each do |name|
       property = Plyushkin::Property.new(name, 
-                                        :type                    => model.registered_types[name],
-                                        :callbacks               => @callbacks[name],
-                                        :ignore_unchanged_values => @model.ignore_unchanged_values[name])
+                                         :type                    => model.registered_types[name],
+                                         :callbacks               => @callbacks[name],
+                                         :ignore_unchanged_values => @model.ignore_unchanged_values[name])
       @properties[name] = property
     end
   end

data/lib/plyushkin/service.rb

@@ -1,3 +1,9 @@
-module Plyushkin::Service; end
+module Plyushkin::Service
+  class << self
+    attr_accessor :service
+  end
+end
 
 require File.dirname(File.expand_path(__FILE__)) + "/service/stub"
+require File.dirname(File.expand_path(__FILE__)) + "/service/web"
+

data/lib/plyushkin/service/stub.rb

@@ -1,15 +1,24 @@
 class Plyushkin::Service::Stub
 
   def initialize
-    @store = {}
+    @models = {}
   end
 
-  def get(id)
-    JSON.parse(@store[id] || "{}")
+  def get(model, id)
+    JSON.parse(get_store(model)[id] || "{}")
   end
 
-  def put(id, json)
-    @store[id] = json
+  def put(model, id, payload)
+    get_store(model)[id] = payload.to_json
+  end
+
+  private
+  def get_store(model)
+    if @models[model]
+      store = @models[model]
+    else
+      store = @models[model] = {}
+    end
   end
 
 end

data/lib/plyushkin/service/web.rb

@@ -0,0 +1,35 @@
+require 'net/http'
+
+class Plyushkin::Service::Web
+  attr_accessor :url
+
+  def initialize(opts={})
+    @url = opts.delete(:url)
+  end
+
+  def get(model, id)
+    uri = URI("#{url}/#{model}/#{id}")
+    use_ssl = true if uri.scheme == "https"
+
+    response = Net::HTTP.start(uri.host, uri.port, 
+                               :use_ssl => use_ssl) do |http|
+      request = Net::HTTP::Get.new(uri.to_s)
+      http.request(request)
+    end
+
+    JSON.parse(response.body)
+  end
+
+  def put(model, id, payload)
+    uri = URI("#{url}/#{model}/#{id}")
+    use_ssl = true if uri.scheme == "https"
+
+    response = Net::HTTP.start(uri.host, uri.port, 
+                               :use_ssl => use_ssl) do |http|
+      request = Net::HTTP::Put.new(uri.to_s)
+      request.body = payload.to_json
+      http.request(request)
+    end
+  end
+
+end

data/lib/plyushkin/test/value_types.rb

@@ -10,6 +10,8 @@ module Plyushkin::Test
   end
 
   class Plyushkin::Test::Member < ActiveRecord::Base; end
+  class Plyushkin::Test::WidgetOne < ActiveRecord::Base; hoards :apples; end
+  class Plyushkin::Test::WidgetTwo < ActiveRecord::Base; hoards :beans; end
 
   class Plyushkin::Test::DateValue < Plyushkin::BaseValue
     persisted_attr :value, :formatter => :to_date

data/lib/plyushkin/version.rb

@@ -1,3 +1,3 @@
 module Plyushkin
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/cache/stub_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Plyushkin::Cache::Stub do
+  let (:cache) { Plyushkin::Cache::Stub.new }
+
+  describe "#write" do
+    it "should write values to the cache" do
+      cache.write("key", "value")
+      cache.read("key").should == "value"
+    end
+  end
+
+end

data/spec/lib/core_ext/active_record_base_spec.rb

@@ -33,6 +33,20 @@ describe ActiveRecord::Base do
         property = member.geolocation
         property.value_type.should == Plyushkin::Test::CoordinateValue
       end
+
+      it 'should use class name when setting up the service' do
+        widget_one = Plyushkin::Test::WidgetOne.new
+        widget_two = Plyushkin::Test::WidgetTwo.new
+
+        widget_one.apples.create(:value => 1)
+        widget_two.beans.create(:value => 2)
+
+        widget_one.save!
+        widget_two.save!
+
+        widget_one.reload.apples.last.value.should == 1
+        widget_two.reload.beans.last.value.should == 2
+      end
     end
 
     describe 'after_create option' do
@@ -155,6 +169,5 @@ describe ActiveRecord::Base do
         member.login_date.last.value.should === now
       end
     end
-
   end
 end

data/spec/lib/persistence_spec.rb

@@ -1,18 +1,22 @@
 require 'spec_helper'
 
 describe Plyushkin::Persistence do
-  let(:service) do
-    service = Plyushkin::Service::Stub.new
-    service.put(1,
+  let(:data) do
       { :name   => [{ :value => "Steve" }] ,
         :weight => [{ :value => 150 }],
         :udt    => [{ :x => 10, :y => 20 }]
-      }.to_json)
+      }
+  end
+  let(:service) do
+    service = Plyushkin::Service.service
+    service.put("widget", 1, data)
     service
   end
 
+  let(:cache) { Plyushkin::Cache.cache }
+
   let(:model) do
-    m = Plyushkin::Model.new(service)
+    m = Plyushkin::Model.new(service, "widget", cache)
     m.register(:name,   Plyushkin::StringValue)
     m.register(:weight, Plyushkin::StringValue)
     m.register(:udt,    Plyushkin::Test::CoordinateValue)
@@ -33,11 +37,10 @@ describe Plyushkin::Persistence do
   end
 
   describe '#save' do
-    it 'should save to source that load uses' do
+    it 'should save to service' do
       persistence.properties[:name].create(:value => "Mike")
       persistence.save(1)
-      persistence.load(1)
-      persistence.properties[:name].last.value.should == "Mike"
+      service.get("widget", 1)["name"].last["value"].should == "Mike"
     end
   end
 
@@ -57,13 +60,13 @@ describe Plyushkin::Persistence do
     end
 
     it 'should parse all history for a property' do
-      service.put(1,
+      service.put("widget", 1,
         {
           :name => [
             { :value => "Ms. Julie Jones",  :date => DateTime.now - 2.days },
             { :value => "Mrs. Julie Smith", :date => DateTime.now - 3.days }
           ]
-      }.to_json)
+      })
 
       property = persistence.properties[:name]
       property.all.length.should == 2
@@ -76,4 +79,21 @@ describe Plyushkin::Persistence do
       persistence.properties[:missing_property].all.should == []
     end
   end
+
+  describe "#caching" do
+    it "should use cache values on subsequent calls" do
+      persistence.properties[:weight].last.value.should == 150
+      service.put("widget", 1,
+        { :weight => [{ :value => 200 }] })
+      persistence.load(1)
+      persistence.properties[:weight].last.value.should == 150
+    end
+
+    it "should update the cache on save" do
+      persistence.properties[:name].create(:value => "Mike")
+      persistence.save(1)
+      persistence.load(1)
+      persistence.properties[:name].last.value.should == "Mike"
+    end
+  end
 end

data/spec/lib/service/stub_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Plyushkin::Service::Stub do
+  let (:service) { Plyushkin::Service::Stub.new }
+  let(:document) do
+    {
+      "weight" => [ {"value" => "5"} ]
+    }
+  end
+
+  describe "#get" do
+    it 'should get data' do
+      service.put("widget", 14, document)
+      service.get("widget", 14).should == document
+    end
+  end
+end

data/spec/lib/service/web_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Plyushkin::Service::Web do
+  let(:document) do
+    {
+      "weight" => [ {"value" => "5"} ]
+    }
+  end
+
+  describe '#get' do
+    it 'should get json payload from service' do
+      stub_request(:get, 'http://plyushkin.com/widget/2').to_return(
+        :body => document.to_json)
+      service = Plyushkin::Service::Web.new(:url => "http://plyushkin.com")
+      service.get("widget", 2).should == document
+    end
+  end
+
+  describe '#put' do
+    it 'should send json payload' do
+      stub_request(:put, 'http://plyushkin.com/widget/2').
+        with(:body => document.to_json).
+        to_return(:status => 200)
+
+      service = Plyushkin::Service::Web.new(:url => "http://plyushkin.com")
+      service.put("widget", 2, document)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,13 +5,18 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
+require 'pry'
 path = File.dirname(File.expand_path(__FILE__))
 require path + '/../lib/plyushkin'
+Plyushkin::Service.service = Plyushkin::Service::Stub.new
+
 require path + '/../lib/plyushkin/test'
 Dir[path + "/support/**/*.rb"].each{ |f| require f }
 
 require 'timecop'
-require 'pry'
+require 'webmock/rspec'
+
+WebMock.disable_net_connect!(:allow_localhost => true)
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
@@ -23,5 +28,9 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  config.after(:each) do
+    Plyushkin::Cache.cache.clear
+  end
 end
 

data/spec/support/sqlite.rb

@@ -7,6 +7,12 @@ class CreateMembers < ActiveRecord::Migration
     create_table :members do |t|
       t.timestamps
     end
+    create_table :widget_ones do |t|
+      t.timestamps
+    end
+    create_table :widget_twos do |t|
+      t.timestamps
+    end
   end
 end
 CreateMembers.up

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plyushkin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -77,6 +77,9 @@ files:
 - Rakefile
 - lib/plyushkin.rb
 - lib/plyushkin/base_value.rb
+- lib/plyushkin/cache.rb
+- lib/plyushkin/cache/rails_cache.rb
+- lib/plyushkin/cache/stub.rb
 - lib/plyushkin/core_ext/active_record_base.rb
 - lib/plyushkin/core_ext/plyushkin_extensions.rb
 - lib/plyushkin/model.rb
@@ -85,6 +88,7 @@ files:
 - lib/plyushkin/property.rb
 - lib/plyushkin/service.rb
 - lib/plyushkin/service/stub.rb
+- lib/plyushkin/service/web.rb
 - lib/plyushkin/string_value.rb
 - lib/plyushkin/test.rb
 - lib/plyushkin/test/value_types.rb
@@ -92,10 +96,13 @@ files:
 - lib/plyushkin/version.rb
 - plyushkin.gemspec
 - spec/lib/base_value_spec.rb
+- spec/lib/cache/stub_spec.rb
 - spec/lib/core_ext/active_record_base_spec.rb
 - spec/lib/nil_value_spec.rb
 - spec/lib/persistence_spec.rb
 - spec/lib/property_spec.rb
+- spec/lib/service/stub_spec.rb
+- spec/lib/service/web_spec.rb
 - spec/lib/value_spec.rb
 - spec/spec_helper.rb
 - spec/support/sqlite.rb
@@ -126,10 +133,13 @@ specification_version: 3
 summary: Plyushkin - the attribute hoarder
 test_files:
 - spec/lib/base_value_spec.rb
+- spec/lib/cache/stub_spec.rb
 - spec/lib/core_ext/active_record_base_spec.rb
 - spec/lib/nil_value_spec.rb
 - spec/lib/persistence_spec.rb
 - spec/lib/property_spec.rb
+- spec/lib/service/stub_spec.rb
+- spec/lib/service/web_spec.rb
 - spec/lib/value_spec.rb
 - spec/spec_helper.rb
 - spec/support/sqlite.rb