refinerycms-core 1.0.0 → 1.0.1

data/lib/gemspec.rb

@@ -1,8 +1,10 @@
+# Encoding: UTF-8
 require 'pathname'
 gempath = Pathname.new(File.expand_path('../../', __FILE__))
 require gempath.join('..', 'base', 'lib', 'base', 'refinery')
 
 gemspec = <<EOF
+# Encoding: UTF-8
 # DO NOT EDIT THIS FILE DIRECTLY! Instead, use lib/gemspec.rb to generate it.
 
 Gem::Specification.new do |s|
@@ -14,7 +16,7 @@ Gem::Specification.new do |s|
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Resolve Digital', 'Philip Arndt', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Resolve Digital', 'Philip Arndt', 'David Jones', 'Steven Heidel', 'Uģis Ozols']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
   s.executables       = %w(#{Pathname.glob(gempath.join('bin/*')).map{|d| d.relative_path_from(gempath)}.sort.join(" ")})
@@ -26,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
   s.add_dependency 'globalize3',                  '~> 0.1'
   s.add_dependency 'awesome_nested_set',          '~> 2.0'
-  s.add_dependency 'rails',                       '~> 3.0.7'
+  s.add_dependency 'rails',                       '~> 3.0.9'
   s.add_dependency 'truncate_html',               '~> 0.5'
   s.add_dependency 'will_paginate',               '~> 3.0.pre'
 

data/lib/generators/refinerycms_generator.rb

@@ -50,8 +50,15 @@ class RefinerycmsGenerator < ::Refinery::Generators::EngineInstaller
 
       gsub_file env, "serve_static_assets = false", "serve_static_assets = true # Refinery CMS requires this to be true", :verbose => false
 
-      unless Rails.root.join(env).read =~ %r{Refinery.rescue_not_found}
-        append_file env, "Refinery.rescue_not_found = #{env.split('/').last.split('.rb').first == 'production'}"
+      unless (env_file_contents = Rails.root.join(env).read) =~ %r{Refinery.rescue_not_found}
+        append_file env, "Refinery.rescue_not_found = #{env.split('/').last.split('.rb').first == 'production'}\n"
+      end
+
+      unless env_file_contents =~ %r{Refinery.s3_backend}
+        s3_backend_string = ["# When true will use Amazon's Simple Storage Service on your production machine"]
+        s3_backend_string << "# instead of the default file system for resources and images"
+        s3_backend_string << "Refinery.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)\n"
+        append_file env, s3_backend_string.join("\n")
       end
     end
 

data/lib/refinery/plugin.rb

@@ -3,10 +3,14 @@ module Refinery
 
   class Plugin
 
-    def self.register(&block)
-      plugin = self.new
+    attr_accessor :name, :class_name, :controller, :directory, :url,
+                  :version, :dashboard, :always_allow_access,
+                  :menu_match, :hide_from_menu,
+                  :pathname, :plugin_activity
+    attr_reader   :description
 
-      yield plugin
+    def self.register(&block)
+      yield(plugin = self.new)
 
       raise "A plugin MUST have a name!: #{plugin.inspect}" if plugin.name.blank?
 
@@ -23,13 +27,12 @@ module Refinery
         def self.called_from; "#{new_called_from}"; end
       RUBY
       Object.const_set(plugin.class_name.to_sym, klass)
-    end
 
-    attr_accessor :name, :class_name, :controller, :directory, :url,
-                  :version, :dashboard, :always_allow_access,
-                  :menu_match, :hide_from_menu,
-                  :pathname, :plugin_activity
-    attr_reader   :description
+      # provide a default pathname to where this plugin is using its lib directory.
+      depth = RUBY_VERSION >= "1.9.2" ? 4 : 3
+      plugin.pathname ||= Pathname.new(caller(depth).first.match("(.*)#{File::SEPARATOR}lib")[1])
+      Refinery::Plugins.registered << plugin # add me to the collection of registered plugins
+    end
 
     # Returns the class name of the plugin
     def class_name
@@ -76,6 +79,11 @@ module Refinery
       @menu_match ||= /(admin|refinery)\/#{self.name}$/
     end
 
+    def pathname=(value)
+      value = Pathname.new(value) if value.is_a? String
+      @pathname = value
+    end
+
     # Returns a hash that can be used to create a url that points to the administration part of the plugin.
     def url
       @url ||= if self.controller.present?
@@ -93,12 +101,5 @@ module Refinery
     def add_activity(options)
       (self.plugin_activity ||= []) << Activity::new(options)
     end
-
-    def initialize
-      # save the pathname to where this plugin is using its lib directory which is standard now.
-      depth = RUBY_VERSION >= "1.9.2" ? 4 : 3
-      self.pathname = Pathname.new(caller(depth).first.match("(.*)#{File::SEPARATOR}lib")[1])
-      Refinery::Plugins.registered << self # add me to the collection of registered plugins
-    end
   end
 end

data/lib/refinerycms-core.rb

@@ -100,6 +100,7 @@ module Refinery
       # Register the plugin
       config.after_initialize do
         ::Refinery::Plugin.register do |plugin|
+          plugin.pathname = root
           plugin.name = 'refinery_core'
           plugin.class_name = 'RefineryEngine'
           plugin.version = ::Refinery.version
@@ -110,6 +111,7 @@ module Refinery
 
         # Register the dialogs plugin
         ::Refinery::Plugin.register do |plugin|
+          plugin.pathname = root
           plugin.name = 'refinery_dialogs'
           plugin.version = ::Refinery.version
           plugin.hide_from_menu = true

data/refinerycms-core.gemspec

@@ -1,27 +1,28 @@
+# Encoding: UTF-8
 # DO NOT EDIT THIS FILE DIRECTLY! Instead, use lib/gemspec.rb to generate it.
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{1.0.0}
+  s.version           = %q{1.0.1}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-05-28}
+  s.date              = %q{2011-06-21}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Resolve Digital', 'Philip Arndt', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Resolve Digital', 'Philip Arndt', 'David Jones', 'Steven Heidel', 'Uģis Ozols']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-base',            '= 1.0.0'
-  s.add_dependency 'refinerycms-settings',        '= 1.0.0'
+  s.add_dependency 'refinerycms-base',            '= 1.0.1'
+  s.add_dependency 'refinerycms-settings',        '= 1.0.1'
   s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
   s.add_dependency 'globalize3',                  '~> 0.1'
   s.add_dependency 'awesome_nested_set',          '~> 2.0'
-  s.add_dependency 'rails',                       '~> 3.0.7'
+  s.add_dependency 'rails',                       '~> 3.0.9'
   s.add_dependency 'truncate_html',               '~> 0.5'
   s.add_dependency 'will_paginate',               '~> 3.0.pre'
 

data/spec/lib/refinery/plugin_spec.rb

@@ -61,6 +61,29 @@ module Refinery
 
     end
 
+    describe '#pathname' do
+      it 'should be set by default' do
+        plugin.pathname.should_not == nil
+      end
+    end
+
+    describe '#pathname=' do
+      it 'converts string input to pathname' do
+        plugin.pathname = Rails.root.to_s
+        plugin.pathname.should == Rails.root
+      end
+
+      it 'overrides the default pathname' do
+        current_pathname = plugin.pathname
+        new_pathname = current_pathname.join('tmp', 'path')
+
+        current_pathname.should_not == new_pathname
+
+        plugin.pathname = new_pathname
+        plugin.pathname.should == new_pathname
+      end
+    end
+
     describe '#always_allow_access?' do
       it 'returns false if @always_allow_access is not set or its set to false' do
         plugin.always_allow_access?.should be_false

metadata

@@ -1,20 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-core
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
-  version: 1.0.0
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Resolve Digital
 - Philip Arndt
 - David Jones
 - Steven Heidel
+- "U\xC4\xA3is Ozols"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-28 00:00:00 +12:00
-default_executable: 
+date: 2011-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-base
@@ -24,7 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,7 +45,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -46,6 +61,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id003
@@ -57,6 +76,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
         version: "0.7"
   type: :runtime
   version_requirements: *id004
@@ -68,6 +91,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 3
+        - 2
+        - 1
         version: 3.2.1
   type: :runtime
   version_requirements: *id005
@@ -79,6 +107,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
         version: "0.1"
   type: :runtime
   version_requirements: *id006
@@ -90,6 +122,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
   type: :runtime
   version_requirements: *id007
@@ -101,7 +137,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.7
+        hash: 21
+        segments: 
+        - 3
+        - 0
+        - 9
+        version: 3.0.9
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -112,6 +153,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
         version: "0.5"
   type: :runtime
   version_requirements: *id009
@@ -123,6 +168,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 961915916
+        segments: 
+        - 3
+        - 0
+        - pre
         version: 3.0.pre
   type: :runtime
   version_requirements: *id010
@@ -479,7 +529,6 @@ files:
 - spec/controllers/sitemap_controller_spec.rb
 - spec/lib/refinery/plugin_spec.rb
 - spec/lib/refinery/plugins_spec.rb
-has_rdoc: true
 homepage: http://refinerycms.com
 licenses: 
 - MIT
@@ -493,17 +542,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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: refinerycms
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Core engine for Refinery CMS