radiant-sheets-extension 1.0.5 → 1.0.6

data/README.md

@@ -1,5 +1,7 @@
 # Sheets
 
+[![Build Status](https://secure.travis-ci.org/radiant/radiant-sheets-extension.png)](http://travis-ci.org/radiant/radiant-sheets-extension)
+
 Sheets is a way to manage stylesheets and scripts from your existing page tree. With Sheets, you'll create new types of pages: JavascriptPage and StylesheetPage.
 
 Pages of these types are Sheets.

data/app/helpers/admin/sheet_resource_helper.rb

@@ -0,0 +1,2 @@
+module Admin::SheetResourceHelper
+end

data/app/views/admin/scripts/index.html.haml

@@ -11,8 +11,7 @@
         - models.each do |javascript|
           %tr
             %td.name
-              = image('javascript') 
-              = link_to javascript.title, edit_admin_script_path(javascript)
+              = link_to image('javascript') + ' ' + javascript.title, edit_admin_script_path(javascript)
             %td.filter= javascript.part('body').filter.filter_name
             %td.actions= link_to(image('minus') + ' ' + t('remove'), admin_script_url(javascript), :class => "action", :method => :delete, :confirm => "Is it OK to delete #{javascript.slug}?")
       - else
@@ -30,4 +29,4 @@
           %span
             = f.label :upload, image('upload') + ' ' + t('upload')
             = f.file_field :upload 
-            = f.submit t('create_javascript')
+            = f.submit t('create_javascript')

data/app/views/admin/styles/index.html.haml

@@ -11,8 +11,7 @@
         - models.each do |stylesheet|
           %tr
             %td.name
-              = image('stylesheet') 
-              = link_to stylesheet.title, edit_admin_style_path(stylesheet)
+              = link_to image('stylesheet') + ' ' + stylesheet.title, edit_admin_style_path(stylesheet)
             %td.filter= stylesheet.part('body').filter.filter_name
             %td.actions= link_to(image('minus') + ' ' + t('remove'), admin_style_url(stylesheet), :class => "action", :method => :delete, :confirm => "Is it OK to delete #{stylesheet.slug}?")
       - else
@@ -30,4 +29,4 @@
           %span
             = f.label :upload, image('upload') + ' ' + t('upload')
             = f.file_field :upload 
-            = f.submit  t('create_stylesheet')
+            = f.submit  t('create_stylesheet')

data/config/locales/de.yml

@@ -0,0 +1,17 @@
+---
+de: 
+  create_javascript: Javascript anlegen
+  create_stylesheet: CSS anlegen
+  edit_javascript: Javascript bearbeiten
+  edit_stylesheet: CSS bearbeiten
+  new_javascript: Neues Javascript
+  new_stylesheet: Neues CSS
+  path: Pfad
+  sheets: Sheets
+  upload: Hochladen
+  stylesheet_page: CSS
+  javascript_page: Javascript
+  sheets:
+    root_required: "Sie müssen zuerst eine Homepage anlegen, bevor sie ein %{model} erzeugen können."
+  no_styles: 'Keine CSS'
+  no_scripts: 'Keine Javascripts'

data/lib/radiant-sheets-extension/version.rb

@@ -1,3 +1,3 @@
 module RadiantSheetsExtension
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/lib/sns_importer.rb

@@ -0,0 +1,70 @@
+class SnsImporter
+  class OldTextAsset < ActiveRecord::Base
+    set_table_name 'text_assets'
+    belongs_to :created_by, :class_name => 'User'
+    belongs_to :updated_by, :class_name => 'User'
+  end
+  
+  def sns_assets
+    OldTextAsset.all
+  end
+  
+  def stylesheet_root
+    @stylesheet_root ||= StylesheetPage.root || StylesheetPage.create_root
+  end
+  
+  def javascript_root
+    @javascript_root ||= JavascriptPage.root || JavascriptPage.create_root
+  end
+  
+  def root(which)
+    case which
+    when 'stylesheet'
+      stylesheet_root
+    when 'javascript'
+      javascript_root
+    end
+  end
+  
+  def call
+    sns_assets.each do |ta|
+      p "Importing #{ta.class_name} #{ta.name}"
+      create_text_asset(ta.attributes)
+    end
+  end
+  
+  def create_text_asset(attrs)
+    class_name = attrs.fetch 'class_name', 'Stylesheet'
+    klass = (class_name + 'Page').constantize
+    sheet = klass.new_with_defaults
+
+    sheet.slug = attrs['name']
+    
+    unless Page.exists?({:slug => sheet.slug, :parent_id => sheet.parent_id, :class_name => sheet.class_name})
+      add_sheet_content(sheet, attrs)
+      set_sheet_parent(sheet, class_name)
+
+      clean_attrs = clean_sns_attributes(sheet, attrs)
+      sheet.update_attributes(clean_attrs)
+    end
+    
+    sheet
+  end
+  
+  def clean_sns_attributes(sheet, attrs)
+    clean_attrs = attrs.dup
+    clean_attrs.delete_if { |att|
+      att[0].to_s.match(/^(lock_version|id|content|filter_id|name|class_name)$/) || !sheet.respond_to?("#{att[0]}=")
+    }
+    clean_attrs
+  end
+  
+  def add_sheet_content(sheet, attrs)
+    sheet.part('body').content = attrs.fetch('content','')
+    sheet.part('body').filter_id = attrs.fetch('filter_id','')
+  end
+  
+  def set_sheet_parent(sheet, class_name)
+    sheet.parent_id = root(class_name.downcase).id
+  end
+end

data/lib/tasks/sheets_extension_tasks.rake

@@ -54,24 +54,7 @@ namespace :radiant do
       namespace :import do
         desc "Creates new sheets pages from old SNS text_assets"
         task :sns => :environment do
-          class TextAsset < ActiveRecord::Base
-            belongs_to :created_by, :class_name => 'User'
-            belongs_to :updated_by, :class_name => 'User'
-          end
-          TextAsset.all.each do |ta| 
-            klass = (ta.class_name + 'Page').constantize
-            p "Importing #{klass} #{ta.name}"
-            sheet = klass.new_with_defaults
-            sheet.part('body').content = ta.content
-            sheet.part('body').filter_id = ta.filter_id
-            sheet.slug = ta.name
-            ta.attributes.each do |attribute, value|
-              if !attribute.match(/^(lock_version|id|content|filter_id|name|class_name)$/) && sheet.respond_to?("#{attribute}=")
-                sheet.send("#{attribute}=", value)
-              end
-            end
-            sheet.save!
-          end
+          SnsImporter.new.call
         end
       end
     end

data/spec/ci/before_script

@@ -0,0 +1,23 @@
+cd ~
+git clone git://github.com/radiant/radiant.git
+cd ~/radiant
+if [[ $RADIANT_VERSION != "master" ]]
+then
+  git checkout -b $RADIANT_VERSION $RADIANT_VERSION
+fi
+cp -r ~/builds/*/radiant-sheets-extension vendor/extensions/sheets
+gem install bundler --pre
+echo 'gem "radiant-sheets-extension", :path => "vendor/extensions/sheets"' >> Gemfile
+bundle install
+
+case $DB in
+  "mysql" )
+    mysql -e 'create database radiant_test;'
+    cp spec/ci/database.mysql.yml config/database.yml;;
+  "postgres" )
+    psql -c 'create database radiant_test;' -U postgres
+    cp spec/ci/database.postgresql.yml config/database.yml;;
+esac
+
+bundle exec rake db:migrate
+bundle exec rake db:migrate:extensions

data/spec/ci/script

@@ -0,0 +1,2 @@
+cd ~/radiant
+bundle exec rake spec:extensions EXT=sheets

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-sheets-extension
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Radiant CMS Dev Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 Z
+date: 2012-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sass
@@ -63,6 +63,7 @@ files:
 - app/controllers/admin/sheet_resource_controller.rb
 - app/controllers/admin/styles_controller.rb
 - app/helpers/admin/scripts_helper.rb
+- app/helpers/admin/sheet_resource_helper.rb
 - app/helpers/admin/styles_helper.rb
 - app/models/javascript_page.rb
 - app/models/sheet.rb
@@ -75,6 +76,7 @@ files:
 - app/views/admin/styles/edit.html.haml
 - app/views/admin/styles/index.html.haml
 - app/views/admin/styles/new.html.haml
+- config/locales/de.yml
 - config/locales/en.yml
 - config/locales/nl.yml
 - config/routes.rb
@@ -89,6 +91,7 @@ files:
 - lib/radiant-sheets-extension.rb
 - lib/sass_filter.rb
 - lib/scss_filter.rb
+- lib/sns_importer.rb
 - lib/stylesheet_tags.rb
 - lib/tasks/sheets_extension_tasks.rake
 - LICENSE
@@ -99,6 +102,8 @@ files:
 - README.md
 - sass.html
 - sheets_extension.rb
+- spec/ci/before_script
+- spec/ci/script
 - spec/controllers/admin/scripts_controller_spec.rb
 - spec/controllers/admin/styles_controller_spec.rb
 - spec/datasets/javascripts_dataset.rb
@@ -146,6 +151,8 @@ signing_key:
 specification_version: 3
 summary: Sheets for Radiant CMS
 test_files: 
+- spec/ci/before_script
+- spec/ci/script
 - spec/controllers/admin/scripts_controller_spec.rb
 - spec/controllers/admin/styles_controller_spec.rb
 - spec/datasets/javascripts_dataset.rb