tyrion 0.1.0 → 0.2.0

data/lib/tyrion/attributes.rb

@@ -1,6 +1,9 @@
 module Tyrion
-  module Attributes
-    extend ActiveSupport::Concern
+  module Attributes    
+    def self.included(receiver)
+      receiver.extend ClassMethods
+      receiver.send :include, InstanceMethods
+    end
     
     module ClassMethods
       def field(name, type = String)
@@ -14,11 +17,6 @@ module Tyrion
     module InstanceMethods
       attr_reader :attributes
       
-      def initialize
-        super
-        @attributes = {}
-      end
-      
       def method_missing(name, *args)
         attr = name.to_s
         return super unless attributes.has_key? attr.gsub("=", "")

data/lib/tyrion/components.rb

@@ -1,10 +1,13 @@
 module Tyrion
   module Components
-    extend ActiveSupport::Concern
-    
-    include Tyrion::Attributes
-    include Tyrion::Persistence
-    include Tyrion::Querying
-    include Tyrion::Storage
+    def self.included(receiver)
+      receiver.class_eval do
+        include Tyrion::Attributes
+        include Tyrion::Validations
+        include Tyrion::Persistence
+        include Tyrion::Querying
+        include Tyrion::Storage
+      end
+    end
   end
 end

data/lib/tyrion/document.rb

@@ -2,8 +2,14 @@ module Tyrion
   
   # Base module to persist objects.
   module Document
-    extend ActiveSupport::Concern
-    include Tyrion::Components
+    def self.included(receiver)
+      receiver.extend ClassMethods
+      
+      receiver.class_eval do
+        include Tyrion::Components
+        include InstanceMethods
+      end
+    end
     
     module ClassMethods
       protected
@@ -24,6 +30,11 @@ module Tyrion
         other.attributes == attributes
       end
       
+      def initialize(attrs = {})
+        @attributes = attrs.stringify_keys
+        @new_document = true
+      end
+      
       private
       
       def klass_name

data/lib/tyrion/persistence.rb

@@ -1,10 +1,13 @@
 module Tyrion
   module Persistence
-    extend ActiveSupport::Concern
+    def self.included(receiver)
+      receiver.extend ClassMethods
+      receiver.send :include, InstanceMethods
+    end
     
     module ClassMethods
       def create attributes = {}
-        new.tap do |n|
+        new(attributes).tap do |n|
           attributes.each_pair{ |k, v| n.send(:write_attribute, k.to_s, v) }
         end
       end
@@ -22,16 +25,27 @@ module Tyrion
       end
     end
     
-    module InstanceMethods
+    module InstanceMethods      
       def save
-        self.class.storage[klass_name] << self
-        self.class.save_storage klass_name
+        if valid?
+          self.class.storage[klass_name] << self
+          self.class.save_storage klass_name
+          @new_document = false
+          
+          true
+        else
+          false
+        end
       end
       
       def delete
         self.class.storage[klass_name].delete_if{ |doc| self == doc }
         self.class.save_storage klass_name
       end
+      
+      def new_document?
+        @new_document
+      end
     end
   end
 end

data/lib/tyrion/querying.rb

@@ -1,6 +1,8 @@
 module Tyrion
   module Querying
-    extend ActiveSupport::Concern
+    def self.included(receiver)
+      receiver.extend ClassMethods
+    end
     
     module ClassMethods
       def all
@@ -44,8 +46,5 @@ module Tyrion
         end
       end
     end
-  
-    module InstanceMethods
-    end
   end
 end

data/lib/tyrion/storage.rb

@@ -1,9 +1,9 @@
 module Tyrion
   module Storage    
-    extend ActiveSupport::Concern
-        
-    included do
-      reload unless self == Tyrion::Components
+    def self.included(receiver)
+      receiver.extend ClassMethods
+      
+      receiver.reload unless receiver == Tyrion::Components
     end
     
     module ClassMethods
@@ -29,8 +29,6 @@ module Tyrion
         File.open(path, 'w') do |f|
           f.puts MultiJson.encode(storage[klass_name].map &:attributes)
         end
-        
-        true
       end
       
       protected
@@ -39,8 +37,5 @@ module Tyrion
         File.join(Connection.path, klass_name + ".json")
       end
     end
-    
-    module InstanceMethods
-    end
   end
 end

data/lib/tyrion/validations.rb

@@ -0,0 +1,10 @@
+module Tyrion
+  module Validations
+    def self.included(receiver)
+      receiver.class_eval do
+        include ActiveModel::Validations
+        include ActiveModel::Conversion
+      end
+    end
+  end
+end

data/lib/tyrion/version.rb

@@ -1,3 +1,3 @@
 module Tyrion #:nodoc:
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/tyrion.rb

@@ -1,5 +1,5 @@
 require 'multi_json'
-require 'active_support'
+require 'active_model'
 
 require 'tyrion/version'
 require 'tyrion/connection'
@@ -9,5 +9,6 @@ require 'tyrion/persistence'
 require 'tyrion/querying'
 require 'tyrion/storage'
 require 'tyrion/components'
+require 'tyrion/validations'
 
 require 'tyrion/document'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tyrion
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70236571329080 !ruby/object:Gem::Requirement
+  requirement: &70281257801860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236571329080
+  version_requirements: *70281257801860
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70236571328660 !ruby/object:Gem::Requirement
+  requirement: &70281257801040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236571328660
+  version_requirements: *70281257801040
 - !ruby/object:Gem::Dependency
-  name: active_support
-  requirement: &70236573373400 !ruby/object:Gem::Requirement
+  name: activemodel
+  requirement: &70281257816640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236573373400
+  version_requirements: *70281257816640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70236573372980 !ruby/object:Gem::Requirement
+  requirement: &70281257815820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236573372980
+  version_requirements: *70281257815820
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70236573372560 !ruby/object:Gem::Requirement
+  requirement: &70281257814980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236573372560
+  version_requirements: *70281257814980
 description: Tyrion's goal is to provide a fast (as in _easy to setup_) and dirty
   unstructured document store.
 email:
@@ -75,14 +74,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- Gemfile
-- LICENSE
-- README.markdown
-- Rakefile
-- lib/tyrion.rb
 - lib/tyrion/attributes.rb
 - lib/tyrion/components.rb
 - lib/tyrion/connection.rb
@@ -90,15 +81,13 @@ files:
 - lib/tyrion/persistence.rb
 - lib/tyrion/querying.rb
 - lib/tyrion/storage.rb
+- lib/tyrion/validations.rb
 - lib/tyrion/version.rb
-- spec/connection_spec.rb
-- spec/document_spec.rb
-- spec/examples/post.rb
-- spec/fixtures/posts.yml
-- spec/test_helper.rb
-- tyrion.gemspec
-has_rdoc: true
-homepage: http://github.com/
+- lib/tyrion.rb
+- LICENSE
+- README.markdown
+- Rakefile
+homepage: http://github.com/razielgn/tyrion
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -118,13 +107,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Tyrion is a small JSON ODM
-test_files:
-- spec/connection_spec.rb
-- spec/document_spec.rb
-- spec/examples/post.rb
-- spec/fixtures/posts.yml
-- spec/test_helper.rb
+test_files: []
+has_rdoc: 

data/.gitignore

@@ -1,24 +0,0 @@
-.DS_Store?
-.DS_Store
-ehthumbs.db
-Icon?
-Thumbs.db
-
-# Rails
-coverage
-rdoc
-tmp
-pkg
-*.gem
-*.rbc
-lib/bundler/man
-spec/reports
-.config
-.bundle
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
-
-Gemfile.lock

data/.rspec

@@ -1 +0,0 @@
---color

data/.travis.yml

@@ -1,11 +0,0 @@
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - ruby-head
-  - ree
-  - rbx
-  - rbx-2.0
-  - jruby
-
-script: 'bundle exec rspec spec'

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in tyrion.gemspec
-gemspec

data/spec/connection_spec.rb

@@ -1,22 +0,0 @@
-require 'test_helper'
-
-describe Tyrion::Connection do
-  before{ @original_path = subject.path }  
-  after{ subject.path = @original_path }
-  
-  describe '.path' do
-    it 'should raise an exception if no path is set' do
-      expect do
-        subject.path = nil
-        subject.path
-      end.to raise_exception
-    end
-  end
-  
-  describe '.path=' do
-    it 'should set the path correctly' do
-      subject.path = ENV['HOME']
-      subject.path.should == ENV['HOME']
-    end
-  end
-end

data/spec/document_spec.rb

@@ -1,133 +0,0 @@
-require 'test_helper'
-require 'examples/post'
-
-describe Tyrion::Document do
-   
-  let! :yml_posts do
-    YAML.load_file File.join(File.dirname(__FILE__), 'fixtures', 'posts.yml')
-  end
-  
-  before :each do
-    Post.reload
-    
-    yml_posts.each do |p|
-      Post.create! p
-    end
-  end
-  
-  it 'should survive a reload' do
-    Post.reload
-    Post.all.count.should == yml_posts.count
-  end
-  
-  describe ".create" do
-    it 'should create a new instance with given attributes' do
-      post = Post.create :title => "Title", :body => "Body"
-      post.title.should == "Title"
-      post.body.should == "Body"
-    end
-  end
-  
-  describe ".all" do
-    it 'should find three posts' do
-      Post.all.count.should == yml_posts.count
-    end
-  end
-  
-  describe ".find_by_" do
-    context "when performing the search without a regexp" do
-      it "should return a single value" do
-        search = Post.find_by_title("Hello")
-        search.should_not be_nil
-        search.should_not be_a(Array)
-      end
-      
-      it 'should return the first document found' do
-        search = Post.find_by_rank(2)
-        search.title.should == "Testing"
-      end
-      
-      it "should return nil if nothing is found" do
-        Post.find_by_title(5).should be_nil
-      end
-    end
-    
-    context "when performing the search with a regexp" do
-      it "should return a single value" do
-        search = Post.find_by_title(/Hello/).should_not be_nil
-        search.should_not be_nil
-        search.should_not be_a(Array)
-      end
-      
-      it "should return nil if nothing is found" do
-        Post.find_by_title(/^u/).should be_nil
-      end
-    end
-    
-    it 'should raise an exception if the search is performed without arguments' do
-      expect do
-        Post.find_by_body
-      end.to raise_exception
-    end
-    
-    it 'should raise an exception if the search is performed on an unknown attribute' do
-      expect do
-        Post.find_by_id
-      end.to raise_exception
-    end
-  end
-  
-  describe ".remove_all" do
-    it 'should delete every document' do
-      Post.delete_all
-      Post.all.count.should == 0
-    end
-  end
-  
-  describe ".remove" do
-    it "should remove all matching documents" do
-      criteria = { :rank => 2, :body => /!$/ }
-      Post.delete(criteria)
-      Post.where(criteria).should be_empty
-    end
-  end
-  
-  describe ".where" do
-    it 'should return an array on matching documents' do
-      search = Post.where(:rank => 2, :body => /!$/)
-      search.should_not be_nil
-      search.should be_a(Array)
-      search.count.should == 2
-    end
-
-    it 'shoudl return an empty array if no documents are matched' do
-      Post.where(:title => /e/, :body => /^A/, :rank => 9000).should be_empty
-    end
-  end
-  
-  describe "#save" do
-    it 'should save a new document' do
-      post = Post.new
-      post.title = "Title"
-      post.body = "Body"
-      post.save.should be_true
-    end
-  end
-  
-  describe "#method_missing" do
-    it 'should allow to read and update new attributes' do
-      post = Post.new
-      post.send :write_attribute, :comments, 1
-      post.comments.should == 1
-      post.comments = 2
-      post.comments.should == 2
-    end
-  end
-  
-  describe "#delete" do
-    it 'should remove the document' do
-      Post.find_by_title("Hello").delete
-      Post.find_by_title("Hello").should be_nil
-    end
-  end
-end

data/spec/examples/post.rb

@@ -1,7 +0,0 @@
-class Post
-  include Tyrion::Document
-  
-  field :rank
-  field :title
-  field :body
-end

data/spec/fixtures/posts.yml

@@ -1,10 +0,0 @@
----
-- title: Hello
-  body: "Hi there, this is my new blog!"
-  rank: 1
-- title: Testing
-  body: "Just testing some stuff around!"
-  rank: 2
-- title: An idea
-  body: "I've got an idea, lemme try something!"
-  rank: 2

data/spec/test_helper.rb

@@ -1,24 +0,0 @@
-require 'simplecov'
-SimpleCov.start
-
-require 'tmpdir'
-require 'fileutils'
-
-require 'tyrion'
-
-tmpdir = Dir.mktmpdir
-Tyrion::Connection.path = tmpdir
-
-RSpec.configure do |config|
-  config.before(:each) do
-    Tyrion::Connection.path = Dir.mktmpdir
-  end
-  
-  config.after(:each) do
-    FileUtils.rm_rf Tyrion::Connection.path
-  end
-  
-  config.after(:suite) do
-    FileUtils.rm_rf tmpdir
-  end
-end

data/tyrion.gemspec

@@ -1,25 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "tyrion/version"
-
-Gem::Specification.new do |s|
-  s.name        = "tyrion"
-  s.version     = Tyrion::VERSION
-  s.authors     = ["Federico Ravasio"]
-  s.email       = ["ravasio.federico@gmail.com"]
-  s.homepage    = "http://github.com/"
-  s.summary     = %q{Tyrion is a small JSON ODM}
-  s.description = %q{Tyrion's goal is to provide a fast (as in _easy to setup_) and dirty unstructured document store.}
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  
-  s.add_dependency 'multi_json'
-  s.add_dependency 'json_pure'
-  s.add_dependency 'active_support'
-  
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'simplecov'
-end