ransack_abbreviator 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - 1.9.2
+script: "bundle exec rspec spec"

data/README.md

@@ -1,4 +1,4 @@
-ransack-abbreviator
+## Ransack Abbreviator [![Build Status](https://secure.travis-ci.org/jhdavids8/ransack-abbreviator.png)](http://travis-ci.org/jhdavids8/ransack-abbreviator)
 ===================
 
 

data/lib/ransack_abbreviator/configuration.rb

@@ -9,19 +9,31 @@ module RansackAbbreviator
       yield self
     end
     
+    def add_column_abbreviation(column, abbr)
+      self.column_abbreviations[column.to_s] = abbr.to_s
+    end
+    
+    def add_assoc_abbreviation(assoc, abbr)
+      self.assoc_abbreviations[assoc.to_s] = abbr.to_s
+    end
+    
     def column_abbreviation_for(column)
+      column = column.to_s
       self.column_abbreviations.has_key?(column) ? self.column_abbreviations[column] : column
     end
     
     def column_name_for(column_abbr)
+      column_abbr = column_abbr.to_s
       self.column_abbreviations.has_value?(column_abbr) ? self.column_abbreviations.key(column_abbr) : column_abbr
     end
     
     def assoc_abbreviation_for(assoc)
+      assoc = assoc.to_s
       self.assoc_abbreviations.has_key?(assoc) ? self.assoc_abbreviations[assoc] : assoc
     end
     
     def assoc_name_for(assoc_abbr)
+      assoc_abbr = assoc_abbr.to_s
       self.assoc_abbreviations.has_value?(assoc_abbr) ? self.assoc_abbreviations.key(assoc_abbr) : assoc_abbr
     end
     

data/lib/ransack_abbreviator/version.rb

@@ -1,3 +1,3 @@
 module RansackAbbreviator
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/ransack_abbreviator.rb

@@ -5,19 +5,19 @@ require 'ransack_abbreviator/constants'
 
 module RansackAbbreviator
   extend Configuration
-  
-  class DuplicateColumnAbbreviation < StandardError; end;
 end
 
 RansackAbbreviator.configure do |config|
-  parsed_config = OpenStruct.new((YAML.load_file(config.config_dir.join("ransack_abbreviator.yml")) rescue {}))
-  ransack_abbreviations = parsed_config.ransack_abbreviations
-  if !(ransack_abbreviations["columns"].values & RansackAbbreviator::Constants::RESERVED_KEYWORDS).blank? ||
-    !(ransack_abbreviations["associations"].values & RansackAbbreviator::Constants::RESERVED_KEYWORDS).blank?
-    fail "You used a reserved keyword as an abbreviation. Reserverd keywords: #{RansackAbbreviator::Constants::RESERVED_KEYWORDS.join(", ")}"
+  if File.exist?(config.config_dir.join("ransack_abbreviator.yml"))
+    parsed_config = OpenStruct.new(YAML.load_file(config.config_dir.join("ransack_abbreviator.yml")))
+    ransack_abbreviations = parsed_config.ransack_abbreviations
+    if !(ransack_abbreviations["columns"].values & RansackAbbreviator::Constants::RESERVED_KEYWORDS).blank? ||
+      !(ransack_abbreviations["associations"].values & RansackAbbreviator::Constants::RESERVED_KEYWORDS).blank?
+      fail "You used a reserved keyword as an abbreviation. Reserverd keywords: #{RansackAbbreviator::Constants::RESERVED_KEYWORDS.join(", ")}"
+    end
+    config.column_abbreviations = ransack_abbreviations["columns"] if ransack_abbreviations["columns"]
+    config.assoc_abbreviations = ransack_abbreviations["associations"] if ransack_abbreviations["associations"]
   end
-  config.column_abbreviations = ransack_abbreviations["columns"] if ransack_abbreviations["columns"]
-  config.assoc_abbreviations = ransack_abbreviations["associations"] if ransack_abbreviations["associations"]
 end
 
 require "ransack_abbreviator/ransack_extensions/nodes/condition"

data/spec/ransack_abbreviator/configuration_spec.rb

@@ -2,13 +2,30 @@ require "spec_helper"
 
 module RansackAbbreviator
   describe Configuration do
-    context "parsing a config.yml" do
-      it "initializes the abbreviations" do
-        RansackAbbreviator.column_abbreviations.should_not be_blank
-        RansackAbbreviator.column_abbreviations["name"].should == "nm"
-        RansackAbbreviator.assoc_abbreviations.should_not be_blank
-        RansackAbbreviator.assoc_abbreviations[:authored_article_comments].should == "a_ac"
+    it 'yields RansackAbbreviator on configure' do
+      RansackAbbreviator.configure do |config|
+        config.should eq RansackAbbreviator
       end
+    end  
+    
+    it "adds column abbreviations" do
+      RansackAbbreviator.configure do |config|
+        config.add_column_abbreviation(:tag_id, :tid)
+      end
+      
+      RansackAbbreviator.column_abbreviations.should have_key('tag_id')
+      RansackAbbreviator.column_abbreviation_for(:tag_id).should eq 'tid'
+      RansackAbbreviator.assoc_name_for('tid').should eq 'tag_id'
+    end
+    
+    it "adds association abbreviations" do
+      RansackAbbreviator.configure do |config|
+        config.add_assoc_abbreviation(:notes, :ns)
+      end
+      
+      RansackAbbreviator.assoc_abbreviations.should have_key('notes')
+      RansackAbbreviator.assoc_abbreviation_for('notes').should eq 'ns'
+      RansackAbbreviator.assoc_name_for(:ns).should eq 'notes'
     end
   end
 end

data/spec/spec_helper.rb

@@ -29,7 +29,22 @@ RSpec.configure do |config|
     Schema.create
   end
 
-  config.before(:all)   { Sham.reset(:before_all) }
+  config.before(:all) do
+    Sham.reset(:before_all)
+    RansackAbbreviator.configure do |config|
+      config.add_column_abbreviation(:name, :nm)
+      config.add_column_abbreviation(:title, :tl)
+      config.add_column_abbreviation(:middle_name, :mn)
+      config.add_column_abbreviation(:vote_count, :vc)
+      config.add_assoc_abbreviation(:person, :pr)
+      config.add_assoc_abbreviation(:parent, :pa)
+      config.add_assoc_abbreviation(:children, :ch)
+      config.add_assoc_abbreviation(:comments, :cm)
+      config.add_assoc_abbreviation(:authored_article_comments, :a_ac)
+      config.add_assoc_abbreviation(:notable, :nbl)
+    end
+  end
+  
   config.before(:each)  { Sham.reset(:before_each) }
 end
 

metadata

@@ -2,7 +2,7 @@
 name: ransack_abbreviator
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jamie Davidson
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE