picky-client 0.9.1 → 0.9.2

data/lib/picky-client/convenience.rb

@@ -67,9 +67,14 @@ module Picky
     # have populated the results.
     #
     def entries limit = 20
-      entries = []
-      allocations.each { |allocation| allocation[5].each { |id| break if entries.size > limit; entries << id } }
-      entries
+      if block_given?
+        i = 0
+        allocations.each { |allocation| allocation[5].collect! { |ar_or_rendered| break if i >= limit; i = i + 1; yield ar_or_rendered } }
+      else
+        entries = []
+        allocations.each { |allocation| allocation[5].each { |ar_or_rendered| break if entries.size >= limit; entries << ar_or_rendered } }
+        entries
+      end
     end
     
     # The ids need to come in the order which the ids were returned by the ids method.

data/sinatra_prototype/javascripts/picky.translations.js

@@ -5,15 +5,15 @@ var PickyI18n = { };
 // Set the correct locale for all js code.
 //
 $(function() {
-  PickyI18n.locale = $('html').attr('lang') || 'en';
+  PickyI18n.locale = $('html').attr('lang').split('-')[0] || 'en';
 });
 
 var dictionary = {
   common:{
-    join:   {de:'und',fr:'et',it:'e',en:'and',ch:'und'},
-    'with': {de:'mit',fr:'avec',it:'con',en:'with',ch:'mit'},
-    of: {de:'von',fr:'de',it:'di',en:'of',ch:'vo'},
-    to: {de:'bis',fr:'à',it:'alla',en:'to',ch:'bis'}
+    join:   { de: 'und', fr: 'et',  it: 'e',    en: 'and',  ch: 'und' },
+    'with': { de: 'mit', fr: 'avec',it: 'con',  en: 'with', ch: 'mit' },
+    of:     { de: 'von', fr: 'de',  it: 'di',   en: 'of',   ch: 'vo' },
+    to:     { de: 'bis', fr: 'à',   it: 'alla', en: 'to',   ch: 'bis' }
   },
   results:{
     addination:{

data/spec/picky-client/convenience_spec.rb

@@ -4,15 +4,78 @@ describe Picky::Convenience do
 
   before(:each) do
     @convenience = {
-      :allocations => [[nil, nil, nil, nil, [1,2,3,4,5,6,7,8]],
-                       [nil, nil, nil, nil, [9,10,11,12,13,14,15,16]],
-                       [nil, nil, nil, nil, [17,18,19,20,21,22,23]]],
+      :allocations => [[nil, nil, nil, nil, [1,2,3,4,5,6,7,8], [1,2,3,4,5,6,7,8]],
+                       [nil, nil, nil, nil, [9,10,11,12,13,14,15,16], [9,10,11,12,13,14,15,16]],
+                       [nil, nil, nil, nil, [17,18,19,20,21,22,23], [17,18,19,20,21,22,23]]],
       :offset => 123,
       :total => 12345,
       :duration => 0.12345
     }.extend Picky::Convenience
   end
   
+  describe "entries" do
+    context "default" do
+      context "without block" do
+        it "returns 20 values" do
+           @convenience.entries.should == [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
+        end
+      end
+      context "with block" do
+        it "yields 20 times, each time a different element" do
+          amount = {}
+          @convenience.entries do |entry|
+            amount[entry] = true
+          end
+          amount.size.should == 20
+        end
+        it "replaces all entries" do
+          @convenience.entries do |entry|
+            entry + 1
+          end
+          @convenience.entries.should == (2..21).to_a
+        end
+      end
+    end
+    context "with value" do
+      context "without block" do
+        it "returns 0 entries" do
+          @convenience.entries(0).should == []
+        end
+        it "returns 1 entry" do
+          @convenience.entries(1).should == [1]
+        end
+        it "handles more wished entries than it has" do
+          @convenience.entries(30).should == (1..23).to_a
+        end
+      end
+      context "with block" do
+        it "yields never" do
+          @convenience.entries(0) do |entry|
+            entry.should == :gnorf
+          end
+        end
+        it "yields once" do
+          @convenience.entries(1) do |entry|
+            entry.should == 1
+          end
+        end
+        it "yields the amount of entries it has even if more are wished" do
+          amount = {}
+          @convenience.entries(30) do |entry|
+            amount[entry] = true
+          end
+          amount.size.should == 23
+        end
+        it "replaces all entries" do
+          @convenience.entries(30) do |entry|
+            entry + 1
+          end
+          @convenience.entries(30).should == (2..24).to_a
+        end
+      end
+    end
+  end
+  
   describe "populate_with" do
     before(:each) do
       @results = {
@@ -40,11 +103,11 @@ describe Picky::Convenience do
     end
     it "should populate correctly even without a block" do
       @results.populate_with ARClass
-      @results.entries.should == (1..21).map { |id| ARClass.new(id) }
+      @results.entries.should == (1..20).map { |id| ARClass.new(id) }
     end
     it "should populate correctly with a render block" do
       @results.populate_with(ARClass) { |ar_instance| ar_instance.id.to_s }
-      @results.entries.should == (1..21).map { |id| id.to_s } # "rendering" using to_s
+      @results.entries.should == (1..20).map { |id| id.to_s } # "rendering" using to_s
     end
   end
   
@@ -63,7 +126,7 @@ describe Picky::Convenience do
     it 'should populate with the entries' do
       new_ids = (11..31).to_a # +10
       @results.replace_ids_with new_ids
-      @results.entries.should == (11..31).to_a
+      @results.entries.should == (11..30).to_a
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +02:00
+date: 2010-10-29 00:00:00 +02:00
 default_executable: picky-client
 dependencies: 
 - !ruby/object:Gem::Dependency