almost-happy 0.1.1 → 0.2.0

data/README.md

@@ -33,8 +33,9 @@ using the specific format etc.
 
 When a model is marked as publishable, it provides the following instance methods:
 
-* `published?` - returns a boolean indicating if it's publishe
+* `published?` - returns a boolean indicating if it's published. also aliased to `published` for forms.
 * `publish!` - mark the post as published right now.
+* `published=(value)` - mark items as published in forms.
 
 And, the following class methods:
 

data/Rakefile

@@ -16,6 +16,7 @@ begin
     gem.add_dependency "RedCloth"
     gem.add_dependency "rdiscount"
     gem.add_dependency "nokogiri"
+    gem.add_dependency "open4" # For albino
     gem.add_development_dependency "shoulda", ">= 0"
   end
   Jeweler::GemcutterTasks.new

data/almost-happy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{almost-happy}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-05-03}
+  s.date = %q{2010-07-07}
   s.description = %q{Helpers, convertors etc for Rails 3 to make page / post models for simple cases simple}
   s.email = %q{sutto@sutto.net}
   s.extra_rdoc_files = [
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/Sutto/almost-happy}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple tools for AR + Rails 3 to help make managing your content easy}
   s.test_files = [
     "test/helper.rb",
@@ -49,17 +49,19 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0.beta3"])
       s.add_runtime_dependency(%q<RedCloth>, [">= 0"])
       s.add_runtime_dependency(%q<rdiscount>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+      s.add_runtime_dependency(%q<open4>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.0.0.beta3"])
       s.add_dependency(%q<RedCloth>, [">= 0"])
       s.add_dependency(%q<rdiscount>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<open4>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
     end
   else
@@ -67,6 +69,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<RedCloth>, [">= 0"])
     s.add_dependency(%q<rdiscount>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<open4>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
   end
 end

data/lib/almost_happy/convertable.rb

@@ -3,37 +3,37 @@ require 'set'
 module AlmostHappy
   module Convertable
     extend ActiveSupport::Concern
-    
+
     included do
       class_attribute :convertable_fields
       self.convertable_fields = Set.new
       before_save :process_convertable_sections
     end
-    
+
     module ClassMethods
-      
+
       def validate_convertable_format
         validates_presence_of :format
         validates_with AlmostHappy::FormatValidator
       end
-      
+
     end
-    
+
     module InstanceMethods
-      
+
       protected
-      
+
       def process_convertable_sections
         convertable_fields.each do |field|
           AlmostHappy::Convertor.new(self, field).render if should_render?(field)
         end
       end
-      
+
       def should_render?(field)
         send(:"rendered_#{field}").blank? || format_changed? || send(:"#{field}_changed?")
       end
-      
+
     end
-    
+
   end
-end
+end

data/lib/almost_happy/publishable.rb

@@ -1,18 +1,30 @@
 module AlmostHappy
   module Publishable
     extend ActiveSupport::Concern
-    
+
     module InstanceMethods
-      
+
+      def published=(value)
+        # Sets the attribute, uses the ar conversion method)
+        if defined?(ActiveRecord)
+          value = ActiveRecord::ConnectionAdapters::Column.value_to_boolean(value)
+        else
+          value = value.present? && !["0", "false"].include?(value.to_s)
+        end
+        real_value = value ? Time.now : nil
+        self.published_at = value
+      end
+
       def published?
         published_at.present? && published_at <= Time.now
       end
-      
+      alias published published?
+
       def publish!
         update_attribute :published_at, Time.now
       end
-      
+
     end
-    
+
   end
-end
+end

data/lib/almost_happy/scopeable.rb

@@ -1,22 +1,26 @@
 module AlmostHappy
   module Scopeable
     extend ActiveSupport::Concern
-    
+
     module ClassMethods
-      
+
       def published
         where 'published_at IS NOT NULL AND published_at <= ?', Time.now
       end
-      
+
+      def unpublished
+        where 'published_at IS NULL OR published_at > ?', Time.now
+      end
+
       def ordered
         order 'published_at DESC'
       end
-      
+
       def ordered_for_preview
         order '(published_at IS NULL) DESC, published_at DESC'
       end
-      
+
     end
-    
+
   end
-end
+end

data/lib/almost_happy.rb

@@ -4,19 +4,19 @@ require 'active_support/core_ext/class/attribute'
 require 'active_support/concern'
 
 module AlmostHappy
-  VERSION = '0.1.1'.freeze
-  
+  VERSION = '0.2.0'.freeze
+
   extend ActiveSupport::Autoload
-  
+
   autoload :ActiveRecordMixin
-  
+
   autoload :Convertor
   autoload :FormatValidator
-  
+
   autoload :Convertable
   autoload :Scopeable
   autoload :Publishable
-  
+
   ::ActiveRecord::Base.send :include, ActiveRecordMixin if defined?(::ActiveRecord::Base)
-  
-end
+
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: almost-happy
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 +08:00
+date: 2010-07-07 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: -1848230021
         segments: 
         - 3
         - 0
@@ -36,9 +39,11 @@ dependencies:
   name: RedCloth
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -48,9 +53,11 @@ dependencies:
   name: rdiscount
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -60,26 +67,44 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: open4
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Helpers, convertors etc for Rails 3 to make page / post models for simple cases simple
 email: sutto@sutto.net
 executables: []
@@ -117,23 +142,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple tools for AR + Rails 3 to help make managing your content easy