radiant-library-extension 2.0.0 → 2.0.1

data/VERSION

@@ -0,0 +1 @@
+2.0.1

data/lib/library/library_tags.rb

@@ -145,6 +145,10 @@ module Library
       Displays a list of the pages associated with the current tag set. If no tags are specified, this will show all pages.
       You can use all the usual r:page tags within the list.
       
+      :by, :order, :limit, :offset, :status and all the usual list-control attributes are obeyed.
+      
+      To paginate the list, set paginated="true" and, optionally, per_page="xx".
+      
       *Usage:* 
       <pre><code>
         <r:library:pages:each><li><r:link /><br /><r:content part="description" /></li></r:library:pages:each>
@@ -174,6 +178,10 @@ module Library
       Displays a list of the assets associated with the current tag set. If no tags are specified, this will show all assets.
       You can use all the usual r:assets tags within the list.
       
+      By, order, limit and offset attributes are obeyed. The default is to sort by creation date, descending.
+      
+      To paginate the list, set paginated="true" and, optionally, per_page="xx".
+      
       *Usage:* 
       <pre><code>
         <r:library:assets:each><li><r:assets:thumbnail /></li></r:library:assets:each>
@@ -184,7 +192,7 @@ module Library
       tag.expand
     end
     tag "library:assets:each" do |tag|
-      tag.render('asset_list', tag.attr.dup, &tag.block)
+      tag.render('asset_list', tag.attr.dup, &tag.block)       # r:page_list is defined in spanner's paperclipped
     end
 
     desc %{
@@ -249,24 +257,65 @@ module Library
         end
       end
 
-      # in the absence of any requested tags we default to all, not none
-
+      # a bit of extra logic so that in the absence of any requested tags we default to all, not none
+      
+      def _default_library_find_options
+        {
+          :by => 'created_at',
+          :order => 'desc'
+        }
+      end
+      
       def _get_pages(tag)
+        options = children_find_options(tag)
         requested = _get_requested_tags(tag)
-        if requested.any?
-          Page.tagged_with(requested)
-        else
-          Page.scoped({})   # there must be a better way to return a new scope
-        end
+        pages = Page.scoped(options)
+        pages = pages.tagged_with(requested) if requested.any?
+        pages
       end
 
       def _get_assets(tag)
+        options = asset_find_options(tag)
         requested = _get_requested_tags(tag)
-        if requested.any?
-          Asset.tagged_with(requested)
+        assets = Asset.scoped(options)
+        assets = assets.tagged_with(requested) if requested.any?
+        assets
+      end
+      
+      # duplicate of children_find_options except:
+      # no virtual or status options
+      # defaults to chronological descending
+      
+      def asset_find_options(tag)
+        attr = tag.attr.symbolize_keys
+
+        options = {}
+
+        [:limit, :offset].each do |symbol|
+          if number = attr[symbol]
+            if number =~ /^\d{1,4}$/
+              options[symbol] = number.to_i
+            else
+              raise TagError.new("`#{symbol}' attribute of `each' tag must be a positive number between 1 and 4 digits")
+            end
+          end
+        end
+
+        by = (attr[:by] || 'created_at').strip
+        order = (attr[:order] || 'desc').strip
+        order_string = ''
+        if self.attributes.keys.include?(by)
+          order_string << by
+        else
+          raise TagError.new("`by' attribute of `each' tag must be set to a valid field name")
+        end
+        if order =~ /^(asc|desc)$/i
+          order_string << " #{$1.upcase}"
         else
-          Asset.scoped({})
+          raise TagError.new(%{`order' attribute of `each' tag must be set to either "asc" or "desc"})
         end
+        options[:order] = order_string
+        options
       end
 
     end

data/radiant-library-extension.gemspec

@@ -0,0 +1,79 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{radiant-library-extension}
+  s.version = "2.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["spanner"]
+  s.date = %q{2010-09-14}
+  s.description = %q{Combines paperclipped and taggable to create a general purpose faceted library}
+  s.email = %q{will@spanner.org}
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    "README.md",
+     "Rakefile",
+     "VERSION",
+     "app/models/library_page.rb",
+     "app/views/admin/assets/_edit_metadata.html.haml",
+     "app/views/admin/assets/_edit_title.html.haml",
+     "app/views/admin/tags/_show_assets.html.haml",
+     "cucumber.yml",
+     "db/migrate/20091030115120_furniture.rb",
+     "features/support/env.rb",
+     "features/support/paths.rb",
+     "lib/library/library_tag.rb",
+     "lib/library/library_tags.rb",
+     "lib/library/link_renderer.rb",
+     "lib/library/more_asset_tags.rb",
+     "lib/library/more_tag_tags.rb",
+     "lib/library/site_controller.rb",
+     "lib/library/tagged_asset.rb",
+     "lib/tasks/library_extension_tasks.rake",
+     "library_extension.rb",
+     "pkg/radiant-library-extension-2.0.0.gem",
+     "radiant-library-extension.gemspec",
+     "spec/controllers/library_site_controller_spec.rb",
+     "spec/datasets/library_pages_dataset.rb",
+     "spec/datasets/library_sites_dataset.rb",
+     "spec/datasets/library_tags_dataset.rb",
+     "spec/models/library_page_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/spanner/radiant-library-extension}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Library Extension for Radiant CMS}
+  s.test_files = [
+    "spec/controllers/library_site_controller_spec.rb",
+     "spec/datasets/library_pages_dataset.rb",
+     "spec/datasets/library_sites_dataset.rb",
+     "spec/datasets/library_tags_dataset.rb",
+     "spec/models/library_page_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<radiant>, [">= 0.9.0"])
+      s.add_runtime_dependency(%q<radiant-taggable-extension>, [">= 1.2.0"])
+    else
+      s.add_dependency(%q<radiant>, [">= 0.9.0"])
+      s.add_dependency(%q<radiant-taggable-extension>, [">= 1.2.0"])
+    end
+  else
+    s.add_dependency(%q<radiant>, [">= 0.9.0"])
+    s.add_dependency(%q<radiant-taggable-extension>, [">= 1.2.0"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-library-extension
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +01:00
+date: 2010-09-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ extra_rdoc_files:
 files: 
 - README.md
 - Rakefile
+- VERSION
 - app/models/library_page.rb
 - app/views/admin/assets/_edit_metadata.html.haml
 - app/views/admin/assets/_edit_title.html.haml
@@ -78,6 +79,8 @@ files:
 - lib/library/tagged_asset.rb
 - lib/tasks/library_extension_tasks.rake
 - library_extension.rb
+- pkg/radiant-library-extension-2.0.0.gem
+- radiant-library-extension.gemspec
 - spec/controllers/library_site_controller_spec.rb
 - spec/datasets/library_pages_dataset.rb
 - spec/datasets/library_sites_dataset.rb