radiant-sheets-extension 1.0.10 → 1.0.11

data/app/controllers/admin/sheet_resource_controller.rb

@@ -9,8 +9,14 @@ class Admin::SheetResourceController < Admin::ResourceController
     if params[:upload].blank?  # necessary params are missing
       render :text => '', :status => :bad_request
     else
-      @sheet = model_class.create_from_upload!(params[:upload][:upload])
-      response_for :create
+      @sheet = model_class.create_or_update_from_upload!(params[:upload][:upload])
+      if @sheet.new_record?
+        response_for :create
+      else
+        slug = params[:upload][:upload].original_filename.to_slug().gsub(/-dot-css$/,'.css').gsub(/-js/,'.js')
+        flash[:notice] = "#{slug} was succesfully overwritten."
+        response_for :update
+      end
     end
   end
   

data/app/models/sheet.rb

@@ -10,7 +10,7 @@ module Sheet
         class_inheritable_accessor :sheet_root
         
         def self.root
-          Page.find_by_path('/').children.first(:conditions => {:class_name => self.to_s})
+          Page.root.children.first(:conditions => {:class_name => self.to_s})
         rescue NoMethodError => e
           e.extend Sheet::InvalidHomePage
           raise e
@@ -18,7 +18,7 @@ module Sheet
 
         def self.create_root
           s = self.new_with_defaults
-          s.parent_id = Page.find_by_slug('/').id
+          s.parent_id = Page.root.id
           s.created_by_id = ''
           s.slug = self.name == 'StylesheetPage' ? 'css' : 'js'
           s.save
@@ -28,10 +28,16 @@ module Sheet
           PagePart.new(:name => 'body')
         end
         
-        def self.create_from_upload!(file)
-          @sheet = self.new_with_defaults
-          @sheet.upload = file
-          @sheet.save!
+        def self.create_or_update_from_upload!(file)
+          slug = file.original_filename.to_slug().gsub(/-dot-css$/,'.css').gsub(/-js/,'.js')
+          @sheet = StylesheetPage.find_by_slug(slug) || JavascriptPage.find_by_slug(slug)
+          if @sheet.nil?
+            @sheet = self.new_with_defaults
+            @sheet.upload = file
+            @sheet.save!
+          else
+            @sheet.part('body').update_attribute :content, file.read
+          end
           @sheet
         end
         
@@ -65,11 +71,12 @@ module Sheet
         end
       end
     end
+    
     def find_by_url(*args)
       ActiveSupport::Deprecation.warn("`find_by_url' has been deprecated; use `find_by_path' instead.", caller)
       find_by_path(*args)
     end
-        
+    
     def upload=(file)
       case
       when file.blank?
@@ -77,7 +84,7 @@ module Sheet
       when !file.kind_of?(ActionController::UploadedFile)
         self.errors.add(:upload, 'is an unusable format.')
       else
-        self.slug = file.original_filename.to_slug().gsub(/-css$/,'.css').gsub(/-js/,'.js')
+        self.slug = file.original_filename.to_slug().gsub(/-dot-css$/,'.css').gsub(/-js/,'.js')
         self.part('body').content = file.read
       end
     end

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

@@ -3,7 +3,7 @@
   %p.title
     = label :sheet_page, :slug, t('slug')
     = f.text_field :slug, :class => 'textbox', :maxlength => 255, :id => "sheet_page_slug"
-    %span.hint= %{Path: #{@root.url}<span id="this_slug">#{model.slug}</span>}
+    %span.hint= %{Path: #{@root.path}<span id="this_slug">#{model.slug}</span>}
   - f.fields_for :parts do |p|
     %p.content
       = p.label :content, t('content')

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

@@ -1,3 +1,3 @@
 module RadiantSheetsExtension
-  VERSION = '1.0.10'
+  VERSION = '1.0.11'
 end

metadata

@@ -1,46 +1,64 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: radiant-sheets-extension
-version: !ruby/object:Gem::Version
-  version: 1.0.10
+version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 11
+  version: 1.0.11
 platform: ruby
-authors:
+authors: 
 - Radiant CMS Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-15 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sass
-  requirement: &70323010924040 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 3
+        - 1
+        - 12
         version: 3.1.12
   type: :runtime
-  prerelease: false
-  version_requirements: *70323010924040
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: coffee-script
-  requirement: &70323010923540 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70323010923540
-description: Manage CSS and Javascript content in Radiant CMS as Sheets, a subset
-  of Pages.
-email:
+  version_requirements: *id002
+description: Manage CSS and Javascript content in Radiant CMS as Sheets, a subset of Pages.
+email: 
 - radiant@radiantcms.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - app/controllers/admin/scripts_controller.rb
 - app/controllers/admin/sheet_resource_controller.rb
 - app/controllers/admin/styles_controller.rb
@@ -101,29 +119,38 @@ files:
 - spec/spec_helper.rb
 homepage: http://radiantcms.org/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Sheets for Radiant CMS
-test_files:
+test_files: 
 - spec/ci/before_script
 - spec/ci/script
 - spec/controllers/admin/scripts_controller_spec.rb
@@ -143,3 +170,4 @@ test_files:
 - features/admin/managing_stylesheets.feature
 - features/support/env.rb
 - features/support/paths.rb
+has_rdoc: