content_blocks 0.2.1 → 0.3.0

data/Gemfile

@@ -5,6 +5,7 @@ gem "RedCloth"
 gem "aasm"
 
 group :development do
+  gem "rails", "~> 3.0.3"
   gem "rspec-rails", "~> 2.1.0"
   gem "rspec", "~> 2.1.0"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -3,6 +3,20 @@ GEM
   specs:
     RedCloth (4.2.3)
     aasm (2.2.0)
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
     activemodel (3.0.3)
       activesupport (= 3.0.3)
       builder (~> 2.1.2)
@@ -12,16 +26,46 @@ GEM
       activesupport (= 3.0.3)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
     activesupport (3.0.3)
     arel (2.0.6)
     builder (2.1.2)
     diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     git (1.2.5)
     i18n (0.5.0)
     jeweler (1.5.1)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    mail (2.2.12)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
     rcov (0.9.9)
     rspec (2.1.0)
@@ -35,6 +79,9 @@ GEM
     rspec-rails (2.1.0)
       rspec (~> 2.1.0)
     sqlite3-ruby (1.3.2)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
     tzinfo (0.3.23)
 
 PLATFORMS
@@ -46,6 +93,7 @@ DEPENDENCIES
   activerecord (~> 3.0.3)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.1)
+  rails (~> 3.0.3)
   rcov
   rspec (~> 2.1.0)
   rspec-rails (~> 2.1.0)

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/content_blocks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{content_blocks}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pawe\305\202 Pacana"]
-  s.date = %q{2010-12-20}
+  s.date = %q{2010-12-23}
   s.description = %q{Content blocks are commonly used models representing editable page partials.}
   s.email = %q{pawel.pacana@gmail.com}
   s.extra_rdoc_files = [
@@ -27,7 +27,8 @@ Gem::Specification.new do |s|
     "VERSION",
     "content_blocks.gemspec",
     "lib/content_blocks.rb",
-    "lib/content_blocks/snippet.rb",
+    "lib/content_blocks/models/snippet.rb",
+    "lib/content_blocks/railtie.rb",
     "lib/generators/content_blocks/snippet_generator.rb",
     "lib/generators/content_blocks/templates/migration.rb",
     "spec/schema/schema.rb",
@@ -53,6 +54,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.3"])
       s.add_runtime_dependency(%q<RedCloth>, [">= 0"])
       s.add_runtime_dependency(%q<aasm>, [">= 0"])
+      s.add_development_dependency(%q<rails>, ["~> 3.0.3"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -69,6 +71,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activerecord>, ["~> 3.0.3"])
       s.add_dependency(%q<RedCloth>, [">= 0"])
       s.add_dependency(%q<aasm>, [">= 0"])
+      s.add_dependency(%q<rails>, ["~> 3.0.3"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.1.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -86,6 +89,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activerecord>, ["~> 3.0.3"])
     s.add_dependency(%q<RedCloth>, [">= 0"])
     s.add_dependency(%q<aasm>, [">= 0"])
+    s.add_dependency(%q<rails>, ["~> 3.0.3"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.1.0"])
     s.add_dependency(%q<rspec>, ["~> 2.1.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/content_blocks/models/snippet.rb

@@ -0,0 +1,49 @@
+require 'active_record'
+require 'aasm'
+require 'RedCloth'
+
+module ContentBlocks
+  module Models
+    class Snippet < ActiveRecord::Base
+      include AASM
+    
+      set_table_name 'content_blocks_snippets'
+      
+      LABEL_FORMAT = /^[a-zA-Z\d_]+$/
+
+      aasm_initial_state :draft
+      aasm_column :status
+
+      aasm_state :draft
+      aasm_state :published
+
+      aasm_event :preview do
+        transitions :from => :published, :to => :draft
+      end
+
+      aasm_event :publish do
+        transitions :from => :draft, :to => :published
+      end
+
+      scope :published, where(:status => 'published')
+      scope :draft, where(:status => 'draft')
+
+      validates :label, 
+        :presence => true, 
+        :format => { :with => LABEL_FORMAT }, 
+        :uniqueness => { :scope => :status, :if => :published? }
+
+      def self.[](label)
+        find_or_create_by_label(label)
+      end
+
+      def content
+        textilize(raw_content)
+      end
+
+      def raw_content
+        self[:content] if published?
+      end   
+    end
+  end
+end

data/lib/content_blocks/railtie.rb

@@ -0,0 +1,11 @@
+require 'content_blocks'
+require 'rails'
+
+module ContentBlocks
+  class Railtie < Rails::Railtie
+    initializer 'append models path' do
+      models_path = File.join(File.dirname(__FILE__), 'models')
+      Rails.application.paths.app.models.push File.expand_path(models_path)
+    end
+  end
+end

data/lib/content_blocks.rb

@@ -1,3 +1,7 @@
+require 'content_blocks/railtie'
+
 module ContentBlocks
-  autoload :Snippet, "content_blocks/snippet"
+  module Models
+    autoload :Snippet, "content_blocks/models/snippet"
+  end
 end

data/spec/snippet_spec.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe ContentBlocks::Snippet do
+describe ContentBlocks::Models::Snippet do
   before do
     @valid_attributes = {
       :label => "sidebar",
       :content => "h1. Sidebar links"
     }
-    @snippet = ContentBlocks::Snippet.new(@valid_attributes)
+    @snippet = ContentBlocks::Models::Snippet.new(@valid_attributes)
   end  
 
   it "should be initially draft" do
@@ -16,7 +16,7 @@ describe ContentBlocks::Snippet do
 
   it "should be unique when published" do
     @snippet.save!
-    cloned = ContentBlocks::Snippet.create!(@valid_attributes)
+    cloned = ContentBlocks::Models::Snippet.create!(@valid_attributes)
     @snippet.publish!
     @snippet.should be_valid
     @snippet.published?.should be_true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: content_blocks
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Pawe\xC5\x82 Pacana"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +01:00
+date: 2010-12-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,8 +65,24 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: rspec-rails
+  name: rails
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rspec-rails
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +93,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rspec
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +109,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: bundler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,12 +125,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id006
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: jeweler
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -125,12 +141,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id007
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rcov
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -139,12 +155,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: sqlite3-ruby
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -153,12 +169,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: aasm
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -169,12 +185,12 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  requirement: *id010
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: RedCloth
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -185,12 +201,12 @@ dependencies:
         - 2
         - 3
         version: 4.2.3
-  requirement: *id011
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: activerecord
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -200,12 +216,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  requirement: *id012
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rspec
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -216,12 +232,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id013
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rspec-rails
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -232,12 +248,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id014
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: sqlite3-ruby
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -246,7 +262,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id015
+  requirement: *id016
 description: Content blocks are commonly used models representing editable page partials.
 email: pawel.pacana@gmail.com
 executables: []
@@ -267,7 +283,8 @@ files:
 - VERSION
 - content_blocks.gemspec
 - lib/content_blocks.rb
-- lib/content_blocks/snippet.rb
+- lib/content_blocks/models/snippet.rb
+- lib/content_blocks/railtie.rb
 - lib/generators/content_blocks/snippet_generator.rb
 - lib/generators/content_blocks/templates/migration.rb
 - spec/schema/schema.rb

data/lib/content_blocks/snippet.rb

@@ -1,47 +0,0 @@
-require 'active_record'
-require 'aasm'
-require 'RedCloth'
-
-module ContentBlocks
-  class Snippet < ActiveRecord::Base
-    include AASM
-  
-    set_table_name 'content_blocks_snippets'
-    
-    LABEL_FORMAT = /^[a-zA-Z\d_]+$/
-
-    aasm_initial_state :draft
-    aasm_column :status
-
-    aasm_state :draft
-    aasm_state :published
-
-    aasm_event :preview do
-      transitions :from => :published, :to => :draft
-    end
-
-    aasm_event :publish do
-      transitions :from => :draft, :to => :published
-    end
-
-    scope :published, where(:status => 'published')
-    scope :draft, where(:status => 'draft')
-
-    validates :label, 
-      :presence => true, 
-      :format => { :with => LABEL_FORMAT }, 
-      :uniqueness => { :scope => :status, :if => :published? }
-
-    def self.[](label)
-      find_or_create_by_label(label)
-    end
-
-    def content
-      textilize(raw_content)
-    end
-
-    def raw_content
-      self[:content] if published?
-    end   
-  end
-end