RubyGems - trusty-clipped-extension - Versions diffs - 1.1.1 → 2.0.0.pre.beta - Mend

trusty-clipped-extension 1.1.1 → 2.0.0.pre.beta

Files changed (13) hide show

checksums.yaml +8 -8
data/Gemfile +5 -0
data/Gemfile.lock +231 -0
data/Rakefile +111 -108
data/app/controllers/admin/assets_controller.rb +1 -1
data/app/models/asset.rb +2 -2
data/app/models/asset_type.rb +2 -2
data/app/views/admin/pages/_asset_popups.html.haml +1 -1
data/config/trustygems.yml +3 -0
data/lib/page_asset_associations.rb +2 -2
data/lib/trusty-clipped-extension.rb +1 -1
data/trusty-clipped-extension.gemspec +1 -1
metadata +9 -6

checksums.yaml CHANGED Viewed

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjE1MWFiNDUxYWY1NjU2MDUxMzE4MGJlODA0MWJiNzExMzUwZTY4ZQ==
+    ZDAyNjY1MmY3ZjRmMzYxNTEwOTVkM2I2NTIyZDcwNzMxNTBmNjJlZg==
   data.tar.gz: !binary |-
-    NmFkNjg1ZDA1YzY4NWI3YzhjYTMzOThiYTliYjZhZTVmOGYxYTQ3ZQ==
+    OGNkYTE2NjYwZjM2MjgxZGY0NGE1YmJkMWY3OWNiMDk4Y2JlMGYyZQ==
 SHA512:
   metadata.gz: !binary |-
-    MDA4ODU3NTQzZDViMDM3YzMxMTc5YjUxNjA5ZWQzMzM2MzU5OWZhYTZjZTk1
-    OTJlZWQwZTI5Y2U4OWExMGM3NTI3NjYzMzBjODcxNzg0ZDhmZTM3ODQwNDE3
-    MTg5ZjIyMWQxN2JmYjQwMmUzMjIyNTA3ZWJiY2VmOTU2OTJiMjY=
+    NjBlMGJmY2E2NjQ5MzBhY2E0ZDk1NWViYjA0NDE4NmFlNTIxZWU5NTU0ZTNl
+    MWZmN2EyNWJlNzczZjRiNWQzNWE2ODUxZGJkOTcwMzE2MzAyYTRiNmI4MDRm
+    YjRjNTRkMzczZTI0NWM0YjlhOTc3MmZhNDAyMmIwZGNjNzU4NWY=
   data.tar.gz: !binary |-
-    NzBlNTdkYjg4MjhiMDhiYzhmNzE3YmM0YzJmMTUxNTBjMTQ4YTEzZDk5MTcx
-    YjUzM2ZhNGU0ZmVlZDEzMjNmYmExZGQ1YzNhNGRjYjlhOWNhZTlmN2M3Mjhh
-    Mjc4OWRhZWYyYjJkOTliMzA4MjFhYjQwNzg2Y2M2ZjY3ZjBkMjA=
+    ZGM4ZjczOTE3M2E1NjU4N2JiMGM2ZjNkYjUzZmU3Mjg2NzYyZGM4MDA0MzJm
+    NzVlZDEyMDE4OWZkYWFhMmZiNWI2NWJkMzM2ZmQ5MTcwZDEzYjM5MGMxZmIx
+    ZjQxNTcyYzQxNjdhODhkNDM4ZDIwZmU5YzA5ODE0MDM2YTI1OTc=

data/Gemfile ADDED Viewed

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gem 'trustygems', '~> 0.1.0'
+gemspec

data/Gemfile.lock ADDED Viewed

@@ -0,0 +1,231 @@
+PATH
+  remote: .
+  specs:
+    trusty-clipped-extension (1.1.1)
+      acts_as_list (= 0.4.0)
+      cocaine (~> 0.5)
+      paperclip (~> 4.2)
+      trusty-cms (~> 2.0.0.pre.beta)
+      uuidtools (~> 2.1)
+GEM
+  remote: https://rubygems.org/
+  specs:
+    RedCloth (4.2.9)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
+      globalid (>= 0.3.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
+      builder (~> 3.1)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
+      arel (~> 6.0)
+    activesupport (4.2.3)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    acts_as_list (0.4.0)
+      activerecord (>= 3.0)
+    acts_as_tree (2.2.0)
+      activerecord (>= 3.0.0)
+    arel (6.0.2)
+    builder (3.2.2)
+    chunky_png (1.3.4)
+    ckeditor (4.1.2)
+      cocaine
+      orm_adapter (~> 0.5.0)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.7)
+      climate_control (>= 0.0.3, < 1.0)
+    compass (1.0.3)
+      chunky_png (~> 1.2)
+      compass-core (~> 1.0.2)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.3)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    compass-rails (2.0.3)
+      compass (~> 1.0.0)
+      sass-rails (<= 5.0.1)
+      sprockets (< 2.13)
+    delocalize (0.4.0)
+      rails (>= 3.0)
+    erubis (2.7.0)
+    execjs (2.5.2)
+    ffi (1.9.10)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
+    haml (4.0.6)
+      tilt
+    haml-rails (0.9.0)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 4.0.6, < 5.0)
+      html2haml (>= 1.0.1)
+      railties (>= 4.0.1)
+    highline (1.7.2)
+    hike (1.2.3)
+    html2haml (2.0.0)
+      erubis (~> 2.7.0)
+      haml (~> 4.0.0)
+      nokogiri (~> 1.6.0)
+      ruby_parser (~> 3.5)
+    i18n (0.7.0)
+    jquery-rails (3.1.3)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.3)
+    libv8 (3.16.14.11)
+    loofah (2.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.6.1)
+    mimemagic (0.3.0)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
+    multi_json (1.11.2)
+    mysql (2.9.1)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    orm_adapter (0.5.0)
+    paperclip (4.3.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      cocaine (~> 0.5.5)
+      mime-types
+      mimemagic (= 0.3.0)
+    protected_attributes (1.0.9)
+      activemodel (>= 4.0.1, < 5.0)
+    rack (1.6.4)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    radius (0.7.4)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.3)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    rb-fsevent (0.9.5)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    ref (2.0.0)
+    ruby_parser (3.7.0)
+      sexp_processor (~> 4.1)
+    sass (3.4.16)
+    sass-rails (5.0.1)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
+    sexp_processor (4.6.0)
+    sprockets (2.12.4)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.3.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    stringex (1.5.1)
+    therubyracer (0.12.2)
+      libv8 (~> 3.16.14.0)
+      ref
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
+    trusty-cms (2.0.0.pre.beta)
+      RedCloth (~> 4.2)
+      acts_as_tree (~> 2.1)
+      bundler (~> 1.7)
+      ckeditor (~> 4.1)
+      compass-rails (~> 2.0)
+      delocalize (~> 0.2)
+      execjs (~> 2.2)
+      haml (~> 4.0)
+      haml-rails (~> 0.5)
+      highline (~> 1.6)
+      jquery-rails (~> 3.1)
+      mysql (~> 2.9)
+      protected_attributes (~> 1.0.9)
+      rack (~> 1.4)
+      rack-cache (~> 1.2)
+      radius (~> 0.7)
+      rails (~> 4.2)
+      rdoc (~> 3.9)
+      stringex (~> 1.3)
+      therubyracer (~> 0.12)
+      tzinfo (~> 1.2)
+      uglifier (~> 2.6)
+      will_paginate (~> 3.0)
+    trustygems (0.1.0)
+      rake
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (2.7.1)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    uuidtools (2.1.5)
+    will_paginate (3.0.7)
+PLATFORMS
+  ruby
+DEPENDENCIES
+  trusty-clipped-extension!
+  trustygems (~> 0.1.0)

data/Rakefile CHANGED Viewed

@@ -1,109 +1,112 @@
-# Determine where the RSpec plugin is by loading the boot
-unless defined? RADIANT_ROOT
-  ENV["RAILS_ENV"] = "test"
-  case
-  when ENV["RADIANT_ENV_FILE"]
-    require File.dirname(ENV["RADIANT_ENV_FILE"]) + "/boot"
-  when File.dirname(__FILE__) =~ %r{vendor/radiant/vendor/extensions}
-    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../")}/config/boot"
-  else
-    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../")}/config/boot"
-  end
-end
+require 'trustygems'
-require 'rake'
-require 'rdoc/task'
-require 'rake/testtask'
-rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')
-$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
-require 'spec/rake/spectask'
-require 'cucumber'
-require 'cucumber/rake/task'
-# Cleanup the RADIANT_ROOT constant so specs will load the environment
-Object.send(:remove_const, :RADIANT_ROOT)
-extension_root = File.expand_path(File.dirname(__FILE__))
-task :default => [:spec, :features]
-task :stats => "spec:statsetup"
-desc "Run all specs in spec directory"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-task :features => 'spec:integration'
-namespace :spec do
-  desc "Run all specs in spec directory with RCov"
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec', '--rails']
-  end
-  desc "Print Specdoc for all specs"
-  Spec::Rake::SpecTask.new(:doc) do |t|
-    t.spec_opts = ["--format", "specdoc", "--dry-run"]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-  end
-  [:models, :controllers, :views, :helpers].each do |sub|
-    desc "Run the specs under spec/#{sub}"
-    Spec::Rake::SpecTask.new(sub) do |t|
-      t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
-    end
-  end
-  desc "Run the Cucumber features"
-  Cucumber::Rake::Task.new(:integration) do |t|
-    t.fork = true
-    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
-    # t.feature_pattern = "#{extension_root}/features/**/*.feature"
-    t.profile = "default"
-  end
-  # Setup specs for stats
-  task :statsetup do
-    require 'code_statistics'
-    ::STATS_DIRECTORIES << %w(Model\ specs spec/models)
-    ::STATS_DIRECTORIES << %w(View\ specs spec/views)
-    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers)
-    ::STATS_DIRECTORIES << %w(Helper\ specs spec/views)
-    ::CodeStatistics::TEST_TYPES << "Model specs"
-    ::CodeStatistics::TEST_TYPES << "View specs"
-    ::CodeStatistics::TEST_TYPES << "Controller specs"
-    ::CodeStatistics::TEST_TYPES << "Helper specs"
-    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
-  end
-  namespace :db do
-    namespace :fixtures do
-      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
-      task :load => :environment do
-        require 'active_record/fixtures'
-        ActiveRecord::Base.establish_connection(Rails.env.to_sym)
-        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Rails.root, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-          Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
-        end
-      end
-    end
-  end
-end
-desc 'Generate documentation for the clipped extension.'
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ClippedExtension'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-# Load any custom rakefiles for extension
-Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }
+# # Determine where the RSpec plugin is by loading the boot
+# unless defined? TRUSTY_CMS_ROOT
+#   ENV["RAILS_ENV"] = "test"
+#   case
+#   when ENV["RADIANT_ENV_FILE"]
+#     require File.dirname(ENV["RADIANT_ENV_FILE"]) + "/boot"
+#   when File.dirname(__FILE__) =~ %r{vendor/radiant/vendor/extensions}
+#     require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../")}/config/boot"
+#   else
+#     require "#{File.expand_path(File.dirname(__FILE__) + "/../../../")}/config/boot"
+#   end
+# end
+#
+# require 'rake'
+# require 'rdoc/task'
+# require 'rake/testtask'
+# require 'trustygems'
+#
+# rspec_base = File.expand_path(TRUSTY_CMS_ROOT + '/vendor/plugins/rspec/lib')
+# $LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
+# require 'spec/rake/spectask'
+# require 'cucumber'
+# require 'cucumber/rake/task'
+#
+# # Cleanup the RADIANT_ROOT constant so specs will load the environment
+# Object.send(:remove_const, :TRUSTY_CMS_ROOT)
+#
+# extension_root = File.expand_path(File.dirname(__FILE__))
+#
+# task :default => [:spec, :features]
+# task :stats => "spec:statsetup"
+#
+# desc "Run all specs in spec directory"
+# Spec::Rake::SpecTask.new(:spec) do |t|
+#   t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
+#   t.spec_files = FileList['spec/**/*_spec.rb']
+# end
+#
+# task :features => 'spec:integration'
+#
+# namespace :spec do
+#   desc "Run all specs in spec directory with RCov"
+#   Spec::Rake::SpecTask.new(:rcov) do |t|
+#     t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
+#     t.spec_files = FileList['spec/**/*_spec.rb']
+#     t.rcov = true
+#     t.rcov_opts = ['--exclude', 'spec', '--rails']
+#   end
+#
+#   desc "Print Specdoc for all specs"
+#   Spec::Rake::SpecTask.new(:doc) do |t|
+#     t.spec_opts = ["--format", "specdoc", "--dry-run"]
+#     t.spec_files = FileList['spec/**/*_spec.rb']
+#   end
+#
+#   [:models, :controllers, :views, :helpers].each do |sub|
+#     desc "Run the specs under spec/#{sub}"
+#     Spec::Rake::SpecTask.new(sub) do |t|
+#       t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
+#       t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
+#     end
+#   end
+#
+#   desc "Run the Cucumber features"
+#   Cucumber::Rake::Task.new(:integration) do |t|
+#     t.fork = true
+#     t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
+#     # t.feature_pattern = "#{extension_root}/features/**/*.feature"
+#     t.profile = "default"
+#   end
+#
+#   # Setup specs for stats
+#   task :statsetup do
+#     require 'code_statistics'
+#     ::STATS_DIRECTORIES << %w(Model\ specs spec/models)
+#     ::STATS_DIRECTORIES << %w(View\ specs spec/views)
+#     ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers)
+#     ::STATS_DIRECTORIES << %w(Helper\ specs spec/views)
+#     ::CodeStatistics::TEST_TYPES << "Model specs"
+#     ::CodeStatistics::TEST_TYPES << "View specs"
+#     ::CodeStatistics::TEST_TYPES << "Controller specs"
+#     ::CodeStatistics::TEST_TYPES << "Helper specs"
+#     ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
+#   end
+#
+#   namespace :db do
+#     namespace :fixtures do
+#       desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+#       task :load => :environment do
+#         require 'active_record/fixtures'
+#         ActiveRecord::Base.establish_connection(Rails.env.to_sym)
+#         (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Rails.root, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+#           Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
+#         end
+#       end
+#     end
+#   end
+# end
+#
+# desc 'Generate documentation for the clipped extension.'
+# RDoc::Task.new(:rdoc) do |rdoc|
+#   rdoc.rdoc_dir = 'rdoc'
+#   rdoc.title    = 'ClippedExtension'
+#   rdoc.options << '--line-numbers' << '--inline-source'
+#   rdoc.rdoc_files.include('README')
+#   rdoc.rdoc_files.include('lib/**/*.rb')
+# end
+#
+# # Load any custom rakefiles for extension
+# Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }

data/app/controllers/admin/assets_controller.rb CHANGED Viewed

@@ -2,7 +2,7 @@ class Admin::AssetsController < Admin::ResourceController
   paginate_models(:per_page => 50)
   def index
-    assets = Asset.scoped({:order => "created_at DESC"})
+    assets = Asset.order("created_at DESC")
     @page = Page.find(params[:page_id]) if params[:page_id]

data/app/models/asset.rb CHANGED Viewed

@@ -8,7 +8,7 @@ class Asset < ActiveRecord::Base
   belongs_to :created_by, :class_name => 'User'
   belongs_to :updated_by, :class_name => 'User'
-  default_scope :order => "created_at DESC"
+  default_scope {order("created_at DESC")}
   scope :latest, lambda { |limit|
     { :order => "created_at DESC", :limit => limit }
@@ -23,7 +23,7 @@ class Asset < ActiveRecord::Base
     { :conditions => ["LOWER(assets.asset_file_name) LIKE (:term) OR LOWER(title) LIKE (:term) OR LOWER(caption) LIKE (:term)", {:term => "%#{term.downcase}%" }] }
   }
-  scope :except, lambda { |assets|
+  scope :excepting, lambda { |assets|
     if assets.any?
       assets = assets.split(',') if assets.is_a?(String)
       asset_ids = assets.first.is_a?(Asset) ? assets.map(&:id) : assets

data/app/models/asset_type.rb CHANGED Viewed

@@ -34,8 +34,8 @@ class AssetType
     Asset.send :define_method, "#{name}?".intern do this.mime_types.include?(asset_content_type) end
     Asset.send :define_class_method, "#{name}_condition".intern do this.condition; end
     Asset.send :define_class_method, "not_#{name}_condition".intern do this.non_condition; end
-    Asset.send :scope, plural.to_sym, :conditions => condition
-    Asset.send :scope, "not_#{plural}".to_sym, :conditions => non_condition
+    Asset.send :scope, plural.to_sym, -> {where(:conditions => condition)}
+    Asset.send :scope, "not_#{plural}".to_sym, -> {where(:conditions => non_condition)}
     self.define_radius_tags
     @@types.push self

data/app/views/admin/pages/_asset_popups.html.haml CHANGED Viewed

@@ -47,7 +47,7 @@
         = render :partial => 'admin/assets/search'
       #assets_table.assets.viewport{:style=>"height: 320px; width: 610px"}
-        - assets = Asset.all.paginate(:per_page => 20)
+        - assets = Asset.all.paginate(:per_page => 20, page: params[:p])
         = render :partial => 'admin/assets/asset_table', :locals => {:assets => assets, :with_pagination => true}
       .busy{:style => "display: none"}= image('spinner.gif', :alt => "")

data/config/trustygems.yml ADDED Viewed

@@ -0,0 +1,3 @@
+gemspec: trusty-clipped-extension.gemspec
+# If using a private server, change this to the necessary command, i.e. gem inabox
+deploy_command: gem push

data/lib/page_asset_associations.rb CHANGED Viewed

@@ -4,8 +4,8 @@ module PageAssetAssociations
   def self.included(base)
     base.class_eval {
-      has_many :page_attachments, :order => "position ASC"
-      has_many :assets, :through => :page_attachments, :order => "page_attachments.position ASC"
+      has_many :page_attachments, -> { order 'position desc' }
+      has_many :assets,{ :through => :page_attachments},  -> { order 'page_attachments.position ASC' }
       accepts_nested_attributes_for :page_attachments, :allow_destroy => true
     }
   end

data/lib/trusty-clipped-extension.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module TrustyCmsClippedExtension
-  VERSION     = "1.1.1"
+  VERSION     = "2.0.0-beta"
   SUMMARY     = %q{Assets for TrustyCms CMS}
   DESCRIPTION = %q{Asset-management derived from Keith Bingman's Paperclipped extension.}
   URL         = "https://github.com/pgharts/trusty-clipped-extension"

data/trusty-clipped-extension.gemspec CHANGED Viewed

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency "paperclip",    "~> 4.2"
   s.add_dependency "uuidtools",    "~> 2.1"
   s.add_dependency "cocaine",      "~> 0.5"
-  s.add_dependency "trusty-cms",   "~> 1.2"
+  s.add_dependency "trusty-cms",   "~> 2.0.0.pre.beta"
   ignores = if File.exist?('.gitignore')
     File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-clipped-extension
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0.pre.beta
 platform: ruby
 authors:
 - Keith Bingman
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -77,14 +77,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.0.0.pre.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.0.0.pre.beta
 description: Asset-management derived from Keith Bingman's Paperclipped extension.
 email:
 - webfeedback@trustarts.org
@@ -92,6 +92,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -183,6 +185,7 @@ files:
 - config/locales/nl.yml
 - config/locales/ru.yml
 - config/routes.rb
+- config/trustygems.yml
 - cucumber.yml
 - db/migrate/001_create_assets.rb
 - db/migrate/002_create_paperclip_attributes.rb
@@ -243,9 +246,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.5