RubyGems - locomotive_cms - Versions diffs - 0.0.2.7 → 0.0.2.8 - Mend

locomotive_cms 0.0.2.7 → 0.0.2.8

Files changed (93) hide show

data/public/stylesheets/admin/layout.css CHANGED

@@ -134,13 +134,23 @@ body {
 /* ___ footer ___ */
 #footer {
+	padding-top: 10px;
 	background: transparent url(/images/admin/background/footer.png) no-repeat 0 0;
 }
 #footer p {
 	padding: 15px 8px 0 0;
-	font-size: 0.6em;
-	color: #444;
+	font-size: 0.8em;
+	color: #E6E6E6;
+}
+#footer p a {
+	color: #1F82BC;
+	text-decoration: none;
+}
+#footer p a:hover {
+	text-decoration: underline;
 }
 /* ___ Alignements ___ */
@@ -166,10 +176,4 @@ body {
 /* ___ NoCoffee / Rails Tags ___ */
-a#nocoffee { text-decoration: none; font-size: 1.1em; line-height: 20px; color: #505b64; padding-right: 20px; margin: 0 4px; background: transparent url(../../images/admin/nocoffee.gif) no-repeat right 0px; }
-a#nocoffee em { color: #ef3f44; font-weight: normal; font-style: normal; }
-a#powered-by { text-decoration: none; font-size: 1.1em; color: #666; }
-a#powered-by:hover{ text-decoration: underline; color: #aaa; }
+a#nocoffee { color: #b0b4c0 !important; text-decoration: none; line-height: 20px; padding-right: 20px; margin: 0 4px; background: transparent url(../../images/admin/nocoffee.png) no-repeat right 0px; }

data/spec/factories.rb CHANGED

@@ -44,7 +44,7 @@ Factory.define :layout do |l|
       <title>My website</title>
     </head>
     <body>
-      <div id="sidebar">\{\{ content_for_sidebar "Left Sidebar"\}\}</div>
+      <div id="sidebar">\{\{ content_for_left_sidebar \}\}</div>
       <div id="main">\{\{ content_for_layout \}\}</div>
     </body>
   </html>}

data/spec/lib/locomotive/httparty/patches_spec.rb ADDED

@@ -0,0 +1,19 @@
+require 'spec_helper'
+describe 'Httparty patches' do
+  describe 'Crack patch' do
+    context '#parsing json' do
+      it 'fixes an issue about json input beginning by a variable declaration' do
+        lambda {
+          Crack::JSON.parse('var json = { "foo": 42 };')
+        }.should_not raise_error
+      end
+    end
+  end
+end

data/spec/lib/locomotive/httparty/webservice_spec.rb ADDED

@@ -0,0 +1,24 @@
+require 'spec_helper'
+describe Locomotive::Httparty::Webservice do
+  context '#consuming' do
+    it 'sets the base uri from a simple url' do
+      Locomotive::Httparty::Webservice.expects(:get).with('/', { :base_uri => 'http://blog.locomotiveapp.org' })
+      Locomotive::Httparty::Webservice.consume('http://blog.locomotiveapp.org')
+    end
+    it 'sets both the base uri and the path from an url with parameters' do
+      Locomotive::Httparty::Webservice.expects(:get).with('/api/read/json?num=3', { :base_uri => 'http://blog.locomotiveapp.org' })
+      Locomotive::Httparty::Webservice.consume('http://blog.locomotiveapp.org/api/read/json?num=3')
+    end
+    it 'sets auth credentials' do
+      Locomotive::Httparty::Webservice.expects(:get).with('/', { :base_uri => 'http://blog.locomotiveapp.org', :basic_auth => { :username => 'john', :password => 'foo' } })
+      Locomotive::Httparty::Webservice.consume('http://blog.locomotiveapp.org', { :username => 'john', :password => 'foo' })
+    end
+  end
+end

data/spec/lib/locomotive/liquid/filters/text_spec.rb ADDED

@@ -0,0 +1,11 @@
+require 'spec_helper'
+describe Locomotive::Liquid::Filters::Text do
+  include Locomotive::Liquid::Filters::Text
+  it 'transforms a textile input into HTML' do
+    textile('This is *my* text.').should == "<p>This is <strong>my</strong> text.</p>"
+  end
+end

data/spec/lib/locomotive/liquid/tags/consume_spec.rb ADDED

@@ -0,0 +1,40 @@
+require 'spec_helper'
+describe Locomotive::Liquid::Tags::Consume do
+  context '#validating syntax' do
+    it 'validates a basic syntax' do
+      markup = 'blog from "http://blog.locomotiveapp.org"'
+      lambda do
+        Locomotive::Liquid::Tags::Consume.new('consume', markup, ["{% endconsume %}"])
+      end.should_not raise_error
+    end
+    it 'validates more complex syntax with attributes' do
+      markup = 'blog from "http://www.locomotiveapp.org" username: "john", password: "easyone"'
+      lambda do
+        Locomotive::Liquid::Tags::Consume.new('consume', markup, ["{% endconsume %}"])
+      end.should_not raise_error
+    end
+    it 'raises an error if the syntax is incorrect' do
+      markup = 'blog from http://www.locomotiveapp.org'
+      lambda do
+        Locomotive::Liquid::Tags::Consume.new('consume', markup, ["{% endconsume %}"])
+      end.should raise_error
+    end
+  end
+  context '#rendering' do
+    it 'puts the response into the liquid variable' do
+      Locomotive::Httparty::Webservice.stubs(:get).returns({ 'title' => 'Locomotive rocks !' })
+      template = "{% consume blog from \"http://blog.locomotiveapp.org/api/read\" %}{{ blog.title }}{% endconsume %}"
+      Liquid::Template.parse(template).render.should == 'Locomotive rocks !'
+    end
+  end
+end

data/spec/lib/locomotive/liquid/tags/nav_spec.rb ADDED

@@ -0,0 +1,41 @@
+require 'spec_helper'
+describe Locomotive::Liquid::Tags::Nav do
+  before(:each) do
+    @home = Factory.build(:page)
+    @home.stubs(:children).returns([
+      Page.new(:title => 'Child #1', :fullpath => 'child_1', :slug => 'child_1'),
+      Page.new(:title => 'Child #2', :fullpath => 'child_2', :slug => 'child_2')
+      ])
+    @home.children.last.stubs(:children).returns([
+      Page.new(:title => 'Child #2.1', :fullpath => 'child_2/sub_child_1', :slug => 'sub_child_1'),
+      Page.new(:title => 'Child #2.2', :fullpath => 'child_2/sub_child_2', :slug => 'sub_child_2')
+      ])
+    @site = Factory.build(:site)
+    @site.stubs(:pages).returns([@home])
+  end
+  context '#rendering' do
+    it 'renders from site' do
+      render_nav.should == '<ul id="nav"><li id="child-1" class="link"><a href="/child_1">Child #1</a></li><li id="child-2" class="link"><a href="/child_2">Child #2</a></li></ul>'
+    end
+    it 'renders from page' do
+      (page = @home.children.last.children.first).stubs(:parent).returns(@home.children.last)
+      output = render_nav 'page', { :page => page }
+      output.should == '<ul id="nav"><li id="sub-child-1" class="link on"><a href="/child_2/sub_child_1">Child #2.1</a></li><li id="sub-child-2" class="link"><a href="/child_2/sub_child_2">Child #2.2</a></li></ul>'
+    end
+  end
+  def render_nav(source = 'site', registers = {})
+    registers = { :site => @site, :page => @home }.merge(registers)
+    liquid_context = ::Liquid::Context.new({}, registers)
+    output = Liquid::Template.parse("{% nav #{source} %}").render(liquid_context)
+    output.gsub(/\n\s{0,}/, '')
+  end
+end

data/spec/models/asset_collections_spec.rb CHANGED

@@ -15,6 +15,8 @@ describe AssetCollection do
       @collection = Factory.build(:asset_collection, :site => site)
       @collection.asset_custom_fields.build :label => 'My Description', :_alias => 'description', :kind => 'Text'
       @collection.asset_custom_fields.build :label => 'Active', :kind => 'Boolean'
+      # AssetCollection.collection.logger = Logger.new($stdout)
+      # AssetCollection.db.connection.instance_variable_set(:@logger, Logger.new($stdout))
     end
     context 'unit' do
@@ -156,10 +158,11 @@ describe AssetCollection do
         @collection.update_attributes(:asset_custom_fields_attributes => {
           '0' => { 'label' => 'My Description', 'kind' => 'Text', '_destroy' => "1" },
           '1' => { 'label' => 'Active', 'kind' => 'Boolean', '_destroy' => "0" },
-          '2' => { 'label' => 'My Title !', 'kind' => 'String' }
+          '2' => { 'label' => 'My Title !', 'kind' => 'String' },
+          'new_record' => { 'label' => 'Published at', 'kind' => 'String' }
         })
         @collection = AssetCollection.first
-        @collection.asset_custom_fields.size.should == 1
+        @collection.asset_custom_fields.size.should == 2
         @collection.asset_custom_fields.first.label.should == 'My Title !'
       end

data/spec/models/layout_spec.rb CHANGED

@@ -27,8 +27,8 @@ describe Layout do
       @layout.parts.first.name.should == 'Body'
       @layout.parts.first.slug.should == 'layout'
-      @layout.parts.last.name.should == 'Left Sidebar'
-      @layout.parts.last.slug.should == 'sidebar'
+      @layout.parts.last.name.should == 'Left sidebar'
+      @layout.parts.last.slug.should == 'left_sidebar'
     end
     it 'should not add parts to pages if layout does not change' do

data/spec/models/page_spec.rb CHANGED

@@ -293,7 +293,7 @@ describe Page do
     before(:each) do
       @page = Factory.build(:page, :site => nil)
       @page.parts.build :slug => 'layout', :value => 'Hello world !'
-      @page.parts.build :slug => 'sidebar', :value => 'A sidebar...'
+      @page.parts.build :slug => 'left_sidebar', :value => 'A sidebar...'
       @page.send(:store_template)
       @layout = Factory.build(:layout, :site => nil)
       @layout.send(:store_template)

data/vendor/plugins/custom_fields/Gemfile CHANGED

@@ -1,9 +1,10 @@
-source "http://gemcutter.org"
+source 'http://gemcutter.org'
-gem "bson_ext", ">= 1.0.1"
-gem "mongo_ext"
-gem "mongoid", ">= 2.0.0.beta6"
-gem "activesupport", ">= 3.0.0.beta3"
+gem 'bson_ext', '>= 1.0.1'
+gem 'mongo_ext'
+gem 'mongoid', '2.0.0.beta6'
+gem 'activesupport', '3.0.0.beta3'
+gem 'carrierwave-rails3', :require => 'carrierwave'
 group :test do
   gem 'rspec', '>= 2.0.0.beta.10'

data/vendor/plugins/custom_fields/lib/custom_fields.rb CHANGED

@@ -1,6 +1,7 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
 require 'active_support'
+require 'carrierwave/orm/mongoid'
 require 'custom_fields/extensions/mongoid/document'
 require 'custom_fields/extensions/mongoid/associations/proxy'
@@ -11,6 +12,8 @@ require 'custom_fields/types/string'
 require 'custom_fields/types/text'
 require 'custom_fields/types/category'
 require 'custom_fields/types/boolean'
+require 'custom_fields/types/date'
+require 'custom_fields/types/file'
 require 'custom_fields/proxy_class_enabler'
 require 'custom_fields/field'
 require 'custom_fields/custom_fields_for'

data/vendor/plugins/custom_fields/lib/custom_fields/field.rb CHANGED

@@ -10,6 +10,8 @@ module CustomFields
     include Types::Text
     include Types::Category
     include Types::Boolean
+    include Types::Date
+    include Types::File
     ## fields ##
     field :label
@@ -26,13 +28,13 @@ module CustomFields
     ## methods ##
     def field_type
-      self.class.field_types[self.kind.to_sym]
+      self.class.field_types[self.kind.downcase.to_sym]
     end
     def apply(klass)
       return unless self.valid?
-      klass.field self._name, :type => self.field_type
+      klass.field self._name, :type => self.field_type if self.field_type
       apply_method_name = :"apply_#{self.kind.downcase}_type"

data/vendor/plugins/custom_fields/lib/custom_fields/types/category.rb CHANGED

@@ -11,7 +11,7 @@ module CustomFields
         accepts_nested_attributes_for :category_items, :allow_destroy => true
-        register_type :category, String
+        register_type :category, ::String
       end
       module InstanceMethods

data/vendor/plugins/custom_fields/lib/custom_fields/types/date.rb ADDED

@@ -0,0 +1,35 @@
+module CustomFields
+  module Types
+    module Date
+      extend ActiveSupport::Concern
+      included do
+        register_type :date, ::Date
+      end
+      module InstanceMethods
+        def apply_date_type(klass)
+          klass.class_eval <<-EOF
+            def #{self.safe_alias}
+              self.#{self._name}.strftime(I18n.t('date.formats.default')) rescue nil
+            end
+            def #{self.safe_alias}=(value)
+              if value.is_a?(String)
+                date = ::Date._strptime(value, I18n.t('date.formats.default'))
+                value = Date.new(date[:year], date[:mon], date[:mday])
+              end
+              self.#{self._name} = value
+            end
+          EOF
+        end
+      end
+    end
+  end
+end

data/vendor/plugins/custom_fields/lib/custom_fields/types/default.rb CHANGED

@@ -20,9 +20,9 @@ module CustomFields
       module ClassMethods
-        def register_type(kind, klass = String)
+        def register_type(kind, klass = ::String)
           self.field_types ||= {}
-          self.field_types[kind.to_sym] = klass
+          self.field_types[kind.to_sym] = klass unless klass.nil?
           self.class_eval <<-EOF
             def #{kind.to_s}?

data/vendor/plugins/custom_fields/lib/custom_fields/types/file.rb ADDED

@@ -0,0 +1,27 @@
+module CustomFields
+  module Types
+    module File
+      extend ActiveSupport::Concern
+      included do
+        register_type :file, nil # do not create the default field
+      end
+      module InstanceMethods
+        def apply_file_type(klass)
+          klass.mount_uploader self._name, FileUploader
+          self.apply_default_type(klass)
+        end
+      end
+      class FileUploader < ::CarrierWave::Uploader::Base
+      end
+    end
+  end
+end

data/vendor/plugins/custom_fields/spec/fixtures/doc.txt ADDED

	@@ -0,0 +1 @@
1	+ Hello world !

data/vendor/plugins/custom_fields/spec/integration/types/file_spec.rb ADDED

@@ -0,0 +1,18 @@
+require 'spec_helper'
+describe CustomFields::Types::File do
+  before(:each) do
+    @project = Project.new(:name => 'Locomotive')
+    @project.task_custom_fields.build(:label => 'Screenshot', :_alias => 'screenshot', :kind => 'File')
+    @project.save
+    @task = @project.tasks.build
+  end
+  it 'attaches file' do
+    @task.screenshot = FixturedFile.open('doc.txt')
+    @task.save
+    @task.screenshot.url.should == '/uploads/doc.txt'
+  end
+end

data/vendor/plugins/custom_fields/spec/spec_helper.rb CHANGED

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-MODELS = File.join(File.dirname(__FILE__), "models")
+MODELS = File.join(File.dirname(__FILE__), 'models')
 $LOAD_PATH.unshift(MODELS)
 require 'rubygems'
@@ -16,16 +16,12 @@ require 'custom_fields'
 Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require File.basename(file) }
-Mongoid.configure do |config|
-  name = "custom_fields_test"
-  host = "localhost"
-  config.master = Mongo::Connection.new.db(name)
-  # config.master = Mongo::Connection.new('localhost', '27017', :logger => Logger.new($stdout)).db(name)
-end
+require 'support/mongoid'
+require 'support/carrierwave'
 Rspec.configure do |config|
   config.mock_with :mocha
   config.after :suite do
-    Mongoid.master.collections.each(&:drop)
+    Mongoid.master.collections.select { |c| c.name != 'system.indexes' }.each(&:drop)
   end
 end

data/vendor/plugins/custom_fields/spec/support/carrierwave.rb ADDED

@@ -0,0 +1,31 @@
+require 'carrierwave/test/matchers'
+CarrierWave.configure do |config|
+  config.storage = :file
+  config.store_dir = "uploads"
+  config.cache_dir = "cache"
+  config.root = File.join(File.dirname(__FILE__), '..', 'tmp')
+end
+module FixturedFile
+  def self.open(filename)
+    File.new(self.path(filename))
+  end
+  def self.path(filename)
+    File.join(File.dirname(__FILE__), '..', 'fixtures', filename)
+  end
+  def self.duplicate(filename)
+    dst = File.join(File.dirname(__FILE__), '..', 'tmp', filename)
+    FileUtils.cp self.path(filename), dst
+    dst
+  end
+  def self.reset!
+    FileUtils.rm_rf(File.join(File.dirname(__FILE__), '..', 'tmp'))
+    FileUtils.mkdir(File.join(File.dirname(__FILE__), '..', 'tmp'))
+  end
+end
+FixturedFile.reset!