leaflet 0.0.2 → 0.0.3

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/bukowskis/leaflet.png)](https://travis-ci.org/bukowskis/leaflet)
+
 # Leaflet
 
 A very robust light-weight paginator based on [leaf](http://github.com/c7/leaf) which is based on [will_paginate](http://github.com/mislav/will_paginate).

data/lib/leaflet/collection.rb

@@ -1,3 +1,4 @@
+require 'positify'
 require 'leaflet/configuration'
 
 module Leaflet
@@ -39,21 +40,21 @@ module Leaflet
     # –––––––––––––––––––––––
 
     def total_entries
-      Leaflet.positify {
+      Positify.it {
         @total_entries ||= self.size
       }
     end
     alias :total_count :total_entries  # Kaminari
 
     def per_page
-      Leaflet.positify(max: Leaflet.config.max_per_page) {
+      Positify.it(max: Leaflet.config.max_per_page) {
         @per_page ||= Leaflet.config.default_per_page
       }
     end
     alias :limit_value :per_page  # Kaminari
 
     def current_page
-      Leaflet.positify(max: total_pages) {
+      Positify.it(max: total_pages) {
         @current_page ||= 1
       }
     end
@@ -68,7 +69,7 @@ module Leaflet
     alias :offset_value :offset  # Kaminari
 
     def total_pages
-      Leaflet.positify {
+      Positify.it {
         total_entries.zero? ? 1 : (total_entries / per_page.to_f).ceil
       }
     end

data/lib/leaflet/configuration.rb

@@ -6,13 +6,13 @@ module Leaflet
     attr_writer :default_per_page, :max_per_page
 
     def default_per_page
-      Leaflet.positify {
+      Positify.it {
         @default_per_page ||= 20
       }
     end
 
     def max_per_page
-      Leaflet.positify {
+      Positify.it {
         @max_per_page ||= 30
       }
     end

data/lib/leaflet/version.rb

@@ -2,7 +2,7 @@ module Leaflet
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/leaflet.rb

@@ -3,33 +3,5 @@ require 'leaflet/collection'
 require 'leaflet/version'
 
 module Leaflet
-
-  def self.positify(*args, &block)
-    if block_given?
-      raise(ArgumentError, "You can only pass in one options Hash in block mode, not #{args.inspect}") if args.size > 1
-      object  = block.call
-      options = args.shift || {}
-    else
-      case args.size
-      when 1
-        object  = args.shift
-        options = {}
-        raise(ArgumentError, "You forgot the brackets in your call. Try: Leaflet.positify(...) do") if object.is_a?(Hash)
-      when 2
-        object  = args.shift
-        options = args.shift
-      else
-        raise ArgumentError, "You must pass in an object and may pass in an options Hash, not #{args.inspect}"
-      end
-    end
-
-    options[:max] = positify(options[:max]) if options[:max]
-
-    return 1 unless object.respond_to?(:to_i)
-    result = object.to_i.abs > 0 ? object.to_i.abs : 1
-    result = options[:max] if options[:max] && options[:max] < result
-    result
-  end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leaflet
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: positify
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +87,6 @@ files:
 - lib/leaflet/version.rb
 - lib/leaflet.rb
 - spec/lib/leaflet/collection_spec.rb
-- spec/lib/leaflet_spec.rb
 - spec/spec_helper.rb
 - README.md
 homepage: https://github.com/bukowskis/leaflet

data/spec/lib/leaflet_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-require 'ostruct'
-
-describe Leaflet do
-
-  describe '.positify' do
-    it 'makes negative numbers positive' do
-      Leaflet.positify(-5).should == 5
-    end
-
-    it 'turns 0 to 1' do
-      Leaflet.positify(0).should == 1
-    end
-
-    it 'returns 1 on non Fixnumerable objects' do
-      Leaflet.positify(OpenStruct.new).should == 1
-    end
-
-    it 'chops Floats to Fixnums' do
-      Leaflet.positify(5.9).should == 5
-    end
-
-    it 'sets a ceiling' do
-      Leaflet.positify(30, max: 22).should == 22
-    end
-
-    it 'ignores the ceiling if the value is below it ' do
-      Leaflet.positify(30, max: 35).should == 30
-    end
-
-    context 'block mode' do
-      it 'makes negative numbers positive' do
-        Leaflet.positify { -5 }.should == 5
-      end
-
-      it 'sets a ceiling' do
-        Leaflet.positify(max: 25) { 30 }.should == 25
-      end
-
-      it 'ignores the ceiling if the value is below it ' do
-        Leaflet.positify(max: 35) { 30 }.should == 30
-      end
-    end
-  end
-
-end