mor 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65cbde4e429fed57d447b4cc8389063afceda07d
-  data.tar.gz: 38ce870a914c548b64fd51d45d6c76ccb8a9092f
+  metadata.gz: ddaa2cec471c5f0c67af4bfabc0ef9753c5f8e36
+  data.tar.gz: a2fb5a1f529128cefa2890385608faf55154dc5a
 SHA512:
-  metadata.gz: 6deeea91d489e2b544f2760b385a9ff0d6886e4da1cf4c8530ffe7b4d4c4c0e1b954a117136c4e0adf35537f3ae541ee5b9dcb31b775ebe8f4dc9d1dadc43ad9
-  data.tar.gz: 48711dc97dcd8f2e682b7f90e2c5698ed0630a75c5589541bd388d2a651eb54f246a68541b01483faf41807d45c1df4cbc8a47ee7773c34a15696723416e01f7
+  metadata.gz: 74b5fa096acbe7deee0c2a598f62f2dc3337f34a110579a4b869548eafd98cc255cf239e08812085a7eb50d24ff7db4a7e62c361ed8b5623c4a4527e63dd8051
+  data.tar.gz: 4f0f4675842c82bef9112978d546ca15fefdac8090fc1490f5cd15b96cffa89463e61e43baaed5a5187ecdf4384ebb53b512eab8e84cde2bc3d6b8253880ce26

data/README.md

@@ -18,7 +18,23 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+	require 'mor'
+	
+	Mor.config do |dalli|
+		dalli['servers'] = "localhost:11211"
+	end
+	
+	class Person
+		include Mor::Model
+		attr_accessor :id, :name
+	end
+	
+	frank = Person.new(id: 1, name: "Frank")
+	frank.persisted? # false
+	frank.valid? # true
+	frank.save # true
+	
+	Person.find(1) # <Person:0x007fc510892b00 @name="Frank">
 
 ## Contributing
 

data/lib/mor.rb

@@ -1,12 +1,29 @@
 require 'mor/version'
-require 'mor/client'
+require 'dalli'
 
 module Mor
   
-  def self.env
-    ENV['RACK_ENV'] ||= "development"
+  @@dalli = {
+    compress:     true,
+    threadsafe:   true,
+    servers:      ENV['MEMCACHIER_SERVERS'],
+    password:     ENV['MEMCACHIER_PASSWORD'],
+    username:     ENV['MEMCACHIER_USERNAME'],
+    async:        true
+  }
+  
+  def self.dalli
+    @@dalli
+  end
+  
+  def self.config
+    yield self
   end
   
-  extend Client
+  def self.cache
+    @@cache ||= begin
+      ::Dalli::Client.new self.dalli["servers"].split(","), self.dalli.reject{|k,v| k == "servers"}
+    end
+  end
   
 end

data/lib/mor/version.rb

@@ -1,3 +1,3 @@
 module Mor
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/model_spec.rb

@@ -1,15 +1,13 @@
 require 'minitest_helper'
-require 'mor'
 require 'mor/model'
 
 class TestModel
   include Mor::Model
-  attr_accessor :id,:title,:body
-  
+  attr_accessor :id, :title, :body
 end
 
 describe Mor::Model do
-
+  
   it "acts as active_model/model" do
     instance = TestModel.new(title: "title", body: "test body")
     instance.title.must_equal "title"

data/spec/mor_spec.rb

@@ -1,5 +1,4 @@
 require 'minitest_helper'
-require 'mor'
 
 describe Mor do
   

data/spec/support/minitest_helper.rb

@@ -4,7 +4,15 @@ require 'minitest/pride'
 require 'minitest/autorun'
 require 'awesome_print'
 
-require_relative "../../config/env"
+require 'mor'
+
+require 'i18n'
+I18n.enforce_available_locales = false
+
+Mor.config do |mor|
+  mor.dalli['namespace']  = "mor:test"
+  mor.dalli['servers']    = "localhost:11211"
+end
 
 class MiniTest::Spec
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Onur Uyar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,11 +106,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- config/cache.yml
-- config/env.rb
-- lib/mor.old.rb
 - lib/mor.rb
-- lib/mor/client.rb
 - lib/mor/model.rb
 - lib/mor/version.rb
 - mor.gemspec

data/config/cache.yml

@@ -1,20 +0,0 @@
-development:
-  compress:     true
-  threadsafe:   true
-  namespace:    mor:development
-  servers:      localhost:11211
-  async:        true
-test:
-  compress:     true
-  threadsafe:   true
-  namespace:    mor:test
-  servers:      localhost:11211
-  async:        true
-production:
-  compress:     true
-  threadsafe:   true
-  namespace:    mor
-  servers:      <%= ENV['MEMCACHIER_SERVERS'] %>
-  password:     <%= ENV['MEMCACHIER_PASSWORD'] %>
-  username:     <%= ENV['MEMCACHIER_USERNAME'] %>
-  async:        true

data/config/env.rb

@@ -1,13 +0,0 @@
-# real time stdout
-$stdout.sync = true
-
-%w(. lib).each do |dir|
-  path = File.expand_path( "../../#{dir}", __FILE__)
-  $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
-end
-
-require 'bundler/setup'
-Bundler.setup
-
-require 'i18n'
-I18n.enforce_available_locales = false

data/lib/mor.old.rb

@@ -1,147 +0,0 @@
-require 'yaml'
-require 'erb'
-require 'dalli'
-require 'active_model'
-require 'active_model/callbacks'
-require 'active_support/hash_with_indifferent_access'
-require 'active_support/concern'
-module Mor
-
-  def self.env
-    ENV['RACK_ENV'] ||= "development"
-  end
-  
-  def self.cache=cache
-    @@cache=cache
-  end
-    
-  def self.cache
-    @@cache ||= begin
-      config = YAML::load(ERB.new(File.read("config/cache.yml")).result)[Mor.env]
-      @instance = Dalli::Client.new config.delete("servers").split(","), config
-    end
-  end
-
-  extend ActiveSupport::Concern
-  extend  ActiveModel::Callbacks    
-      
-  module ClassMethods
-
-    def attr_accessor *attrs
-      super(*attrs)
-      attrs.delete_if{ |a| a == :attributes }.each { |attr| 
-        define_method(:"#{attr}="){|val| self.attributes[attr]=val}
-        define_method(attr){ self.attributes[attr] }            
-      }
-    end
-    
-    def key id = primary_key
-      :"#{self.name.downcase}:#{id}"
-    end
-    
-    def primary_key
-      :id
-    end
-    
-    def create attributes = {}
-      instance = self.new(attributes)
-      instance.save
-      instance
-    end
-    
-  end
-
-  included do
-    include ActiveModel::Model
-    extend  ActiveModel::Callbacks    
-    include ActiveModel::Validations::Callbacks
-    define_model_callbacks :create, :update, :destroy
-    after_create :add_to_index
-    after_destroy :remove_from_index
-    validates_presence_of :id
-    validate :validate_uniqueness_of_id
-  end
-  
-  def attributes
-    @attributes ||= ActiveSupport::HashWithIndifferentAccess.new
-  end
-  
-  def initialize attributes = {}
-    self.attributes ||= ActiveSupport::HashWithIndifferentAccess.new(attributes)
-  end
-  
-  def update attributes={}    
-    self.attributes.update attributes
-    save
-  end
-  
-  def save
-    if self.valid?
-      if self.persisted?
-        run_callbacks :update do
-          cache.set(self.key,self)
-        end
-      else
-        run_callbacks :create do
-          cache.set(self.key,self)
-        end
-      end
-    end
-  end
-  
-  def destroy 
-    run_callbacks :destroy do
-      cache.delete key
-    end    
-  end
-  
-  def key
-    self.class.key self.id
-  end
-  
-  def persisted?
-    self.indexed?
-  end
-  
-  def id
-    self.attributes[self.class.primary_key]
-  end
-  
-  # index 
-  
-  def indexed?
-    @indexed ||= index.include?(self.id)
-  end
-  
-  def index
-    @index ||= begin
-      cache.get(self.class.key) || (self.index=[])
-    end
-  end
-  
-  def index=index
-    @index = begin
-      cache.set(self.class.key,index) ? index : []
-    end
-  end
-  
-  private
-  
-  def add_to_index
-    self.index = index.push(self.id)
-  end
-  
-  def remove_from_index
-    self.index = index.tap{ |index| index.delete(self.id) }
-  end
-  
-  def validate_uniqueness_of_id
-    self.errors.add(:id, :taken) if indexed?
-  end
-  
-  def cache
-    Mor.cache
-  end
-
-  
-end

data/lib/mor/client.rb

@@ -1,16 +0,0 @@
-require 'yaml'
-require 'erb'
-require 'dalli'
-
-module Mor
-  module Client
-  
-    def cache
-      @@cache ||= begin
-        config = YAML::load(ERB.new(File.read("config/cache.yml")).result)[Mor.env]
-        @instance = Dalli::Client.new config.delete("servers").split(","), config
-      end
-    end
-    
-  end
-end