bhf 0.3.10 → 0.3.11

data/config/locales/en.yml

@@ -1,4 +1,4 @@
-en:
+en:  
   bhf:
     pages:
       headline: Content
@@ -17,8 +17,6 @@ en:
         delete: "Delete %{platform_name}"
         empty: Empty
         cancel: Cancel
-      entries:
-        empty: Empty
       login:
         success: "Login was successful"
         error: "Can't login"
@@ -37,20 +35,25 @@ en:
         cancel: Cancel
         open: Open
         save: Save
-        save_and_next: Save and go to next
+        create: Create
+        save_and_next: Save and go to the next entry
     
     pagination:
       previous_label: « Previous
       next_label: Next »
+      truncate: …
       load_more: Show more entries
       load_less: Show less entries
-      entry: entry
       entries: entries
       info:
         default: "Displaying <strong>%{offset_start} - %{offset_end}</strong> of <strong>%{count}</strong> %{name} in total"
-        other: "Displaying <strong>all %{total_count}</strong> %{name_plural}"
+        other: "Displaying <strong>all %{count}</strong> %{name_plural}"
         one: "Displaying <strong>1</strong> %{name_singular}"
         zero: "No %{name_zero} found"
+
+  attributes:
+    _id: 'id'
+
   activerecord:
     notices:
       messages:

data/config/routes.rb

@@ -7,6 +7,7 @@ Rails.application.routes.draw do
     
     scope ':platform' do
       resources :entries, :except => [:index, :show] do
+        resources :embed_entries, :except => [:index, :show], :as => :embed
         collection do 
           # TODO: put it
           get :sort

data/lib/bhf.rb

@@ -6,6 +6,7 @@ require 'engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
 require 'bhf/i18n'
 require 'bhf/active_record/active_record'
 require 'bhf/active_record/upload'
+require 'bhf/mongoid/document'
 require 'bhf/view_helpers'
 require 'bhf/data'
 require 'bhf/platform'

data/lib/bhf/active_record/active_record.rb

@@ -1,6 +1,7 @@
 module Bhf
   module ActiveRecord
     module Object
+
       extend ActiveSupport::Concern
       
       def to_bhf_s
@@ -16,7 +17,7 @@ module Bhf
         self.to_s.humanize
       end
 
-      module ClassMethods
+      module ClassMethods        
         def bhf_default_search(search_params)
           return if (search_term = search_params[:text]).blank?
           where_statement = []
@@ -34,8 +35,16 @@ module Bhf
 
           where_statement.join(' OR ')
         end
+        
+        def bhf_primary_key
+          primary_key
+        end
+        
+        def bhf_embedded?
+          false
+        end
       end
       
     end
   end
-end
+end

data/lib/bhf/active_record/upload.rb

@@ -8,14 +8,6 @@ module Bhf
         cattr_accessor :bhf_upload_settings
       end
 
-      module ClassMethods
-        def setup_upload(settings)
-          self.bhf_upload_settings = settings.each_with_object([]) do |s, obj|
-            obj << {:path => '', :name => :file}.merge(s)
-          end
-        end
-      end
-
       def bhf_upload
         self.class.bhf_upload_settings.each do |settings|
           name_was = send("#{settings[:name]}_was")
@@ -28,7 +20,7 @@ module Bhf
             if file.is_a? ActionDispatch::Http::UploadedFile
               # File.delete(settings[:path] + name_was.to_s) if File.exist?(settings[:path] + name_was.to_s)
 
-              filename = Time.now.to_i.to_s+'_'+file.original_filename.downcase.sub(/[^\w\.\-]/,'_')
+              filename = Time.now.to_i.to_s+'_'+file.original_filename.downcase.sub(/[^\w\.\-]/, '_')
               path = File.join(settings[:path], filename)
               File.open(path, 'w') { |f| f.write(file.read) }
               filename
@@ -40,6 +32,14 @@ module Bhf
         end
       end
 
+      module ClassMethods
+        def setup_upload(settings)
+          self.bhf_upload_settings = settings.each_with_object([]) do |s, obj|
+            obj << {:path => '', :name => :file}.merge(s)
+          end
+        end
+      end
+
     end
   end
 end

data/lib/bhf/data.rb

@@ -66,7 +66,7 @@ module Bhf
       private
 
         def supported_types(check_type)
-          if [:boolean, :text].include?(check_type)
+          if [:boolean, :text, :array].include?(check_type)
             check_type
           elsif type_sym = group_types(check_type)
             type_sym
@@ -91,7 +91,7 @@ module Bhf
       def initialize(reflection, options = {})
         @reflection = reflection
         @info = options[:info]
-        @link = options[:link].to_sym if options[:link]
+        @link = options[:link].downcase.to_sym unless options[:link].blank?
 
         @overwrite_type = options[:overwrite_type].to_sym if options[:overwrite_type]
         @overwrite_display_type = options[:overwrite_display_type].to_sym if options[:overwrite_display_type]

data/lib/bhf/mongoid/document.rb

@@ -0,0 +1,138 @@
+module Bhf
+  module Mongoid
+    module Document
+      
+      extend ActiveSupport::Concern
+
+      class Field
+        attr_reader :type, :name
+
+        def initialize(mongoid_field)
+          @name = mongoid_field.name
+          @type = mongoid_field.type.to_s.downcase.to_sym
+          @type = :primary_key if @type == :'bson::objectid'
+        end
+      end
+
+      class Reflection
+        attr_reader :name, :macro, :klass, :primary_key_name
+
+        def initialize(mongoid_field)
+          @name = mongoid_field.name
+          @klass = mongoid_field.class_name.constantize
+          @primary_key_name = mongoid_field.key
+          @macro = case mongoid_field.macro
+            when :references_and_referenced_in_many
+              :has_and_belongs_to_many
+            when :references_many
+              :has_many
+            when :references_one
+              :has_one
+            when :referenced_in
+              :belongs_to
+            else
+              mongoid_field.macro
+          end
+        end
+      end
+  
+      def to_bhf_s
+        return title if self.respond_to? :title
+        return name if self.respond_to? :name
+    
+        if self.respond_to? :attributes
+          return title if attributes['title']
+          return name if attributes['name']
+          return "#{self.class.to_s.humanize} ID: #{send(self.class.primary_key)}" if attributes[self.class.primary_key]
+        end
+
+        self.to_s.humanize
+      end
+
+      module ClassMethods
+        def columns_hash
+          c = {}
+          fields.each_pair do |key, meta|
+            next if meta.options[:metadata]
+            next if key == '_type'
+            c[key] = Field.new(meta)
+          end
+          c
+        end
+        
+        def reflections
+          c = {}
+          relations.each do |key, meta|
+            next if meta.macro == :embedded_in
+            c[key.to_sym] = Reflection.new(meta)
+          end
+          c
+        end
+        
+        def bhf_primary_key
+          '_id'
+        end
+        
+        def except(key)
+          if key == :order || key == :sort
+            #order_by.extras(:sort => []) #TODO: drop default_scope criteria
+          end
+          self
+        end
+        
+        def order(a)
+          field, direction = a.split(' ')
+          return self if field.blank? or direction.blank?
+          self.send(direction.downcase, field)
+        end
+        
+        def bhf_default_search(search_params)
+          return if (search_term = search_params[:text]).blank?
+          
+          # TODO: add mongoid search
+          #return find(:all, :conditions => {:nick => /^antp/i})
+          return where("this.nick == 'antpaw'")
+        end
+
+        def get_embedded_parent(parent_id, &block)
+          relations.each do |key, meta|
+            next unless meta.macro == :embedded_in
+            parent = meta.class_name.constantize
+            parent = parent.find(parent_id) rescue nil
+            
+            if parent
+              return parent unless block_given?
+              return block.call(parent, meta)
+            end
+          end
+        end
+
+        def bhf_new_embed(parent_id, params = nil)
+          get_embedded_parent parent_id do |parent, meta|
+            if parent.relations[meta.inverse_of.to_s].macro == :embeds_one
+              parent.send("build_#{meta.inverse_of}", params)
+            else
+              parent.send(meta.inverse_of).build(params)
+            end
+          end
+        end
+
+        def bhf_find_embed(parent_id, ref_id)
+          get_embedded_parent parent_id do |parent, meta|
+            relation = parent.send(meta.inverse_of)
+            if parent.relations[meta.inverse_of.to_s].macro == :embeds_one
+              relation
+            else
+              relation.find(ref_id)
+            end
+          end
+        end
+
+        def bhf_embedded?
+          embedded?
+        end
+      end
+
+    end
+  end
+end

data/lib/bhf/pagination.rb

@@ -1,3 +1,31 @@
+module Kaminari
+  module Helpers
+    class Tag
+      def initialize(template, options = {}) #:nodoc:
+        @template, @options = template, options.dup
+        @param_name = @options.delete(:param_name)
+        @theme = @options[:theme] ? "#{@options.delete(:theme)}/" : ''
+        @params = @options[:params] ? template.params.merge(@options.delete :params) : template.params
+      end
+
+      def to_s(locals = {}) #:nodoc:
+        @template.render :partial => "kaminari/#{@theme}#{self.class.name.demodulize.underscore}", :locals => @options.merge(locals)
+      end
+
+      def page_url_for(page)
+        if @param_name.is_a?(Array)
+          @params[@param_name[0]] = (@params[@param_name[0]] || {}).merge(@param_name[1] => (page <= 1 ? nil : page))
+          return @template.url_for @params
+        end
+        
+        @template.url_for @params.merge(@param_name => (page <= 1 ? nil : page))
+      end
+    end
+  end
+end
+# TODO: lets hope they fix nested params and we can remove this
+
+
 module Bhf
 
   class Pagination
@@ -13,15 +41,14 @@ module Bhf
     def create(platform)
       platform_params = template.params[platform.name] || {}
 
-      if page_links = template.will_paginate(platform.objects, {
-        :previous_label => I18n.t('bhf.pagination.previous_label'),
-        :next_label => I18n.t('bhf.pagination.next_label'),
-        :renderer => LinkRenderer.new(self, platform),
-        :container => false
-      })
-        links = "#{load_more(platform)} #{page_links}"
-      elsif platform.objects.total_pages == 1 && platform.objects.size + @offset_to_add > @offset_per_page
-        links = load_less(platform)
+      links = if !(page_links = template.paginate(platform.objects, {
+        :theme => 'bhf',
+        :param_name => [platform.name, 'page'],
+        :params => template.params
+      })).blank?
+        "#{load_more(platform)} #{page_links}"
+      elsif platform.objects.num_pages == 1 && platform.objects.size > @offset_to_add
+        load_less(platform)
       end
 
       if links
@@ -31,21 +58,17 @@ module Bhf
 
     def info(platform, options = {})
       collection = platform.objects
-      
-      unless collection.respond_to?(:total_pages)
-        collection = collection.paginate({:page => 1, :per_page => collection.count+1})
-      end
 
-      if collection.total_pages > 1
+      if collection.respond_to?(:num_pages) and collection.num_pages > 1
         I18n.t('bhf.pagination.info.default', {
           :name => platform.title,
-          :count => collection.total_entries,
-          :offset_start => collection.offset + 1,
-          :offset_end => collection.offset + collection.length
+          :count => collection.total_count,
+          :offset_start => collection.offset_value + 1,
+          :offset_end => collection.offset_value + collection.length
         })
       else
         I18n.t('bhf.pagination.info', {
-          :name_zero => platform.title_zero,
+          :name_zero => platform.title,
           :name_singular => platform.title_singular,
           :name_plural => platform.title,
           :count => collection.size
@@ -79,29 +102,6 @@ module Bhf
     def load_less(platform, attributes = {})
       load_more(platform, attributes, false)
     end
-
-
-    class LinkRenderer < WillPaginate::ViewHelpers::LinkRenderer
-
-      def initialize(bhf_pagination, platform)
-        @b_p = bhf_pagination
-        @platform = platform
-      end
-
-      def link(text, page, attributes = {})
-        platform_params = @b_p.template.params[@platform.name] || {}
-        platform_params[:page] = page
-        
-        @b_p.template.link_to(
-          text, 
-          @b_p.template.bhf_page_path(
-            @platform.page_name,
-            @b_p.template.params.merge(@platform.name => platform_params)
-          ), {:class => 'page_number'}.merge(attributes)
-        )
-      end
-
-    end
     
   end
-end
+end

data/lib/bhf/platform.rb

@@ -66,14 +66,13 @@ module Bhf
         chain = do_search(chain, options[:search])
       end
 
-      if paginate_options && !sortable
-        chain = chain.paginate(paginate_options)
-      end
-      
-      if chain == model
-        chain = chain.all
+
+      chain = if paginate_options && !sortable
+        chain.page(paginate_options[:page]).per(paginate_options[:per_page])
+      elsif chain == model
+        chain.all
       end
-      
+
       @objects = chain
     end
 
@@ -172,7 +171,7 @@ module Bhf
             :overwrite_type => form_options(:types, name),
             :overwrite_display_type => table_options(:types, name),
             :info => I18n.t("bhf.platforms.#{@name}.infos.#{name}", :default => '')
-          }, model.primary_key)
+          }, model.bhf_primary_key)
         end
 
         model.reflections.each_pair do |name, props|
@@ -184,7 +183,7 @@ module Bhf
           })
 
           fk = all[name.to_s].reflection.primary_key_name
-          if all.has_key?(fk)
+          if all.has_key?(fk) and fk != name.to_s
             all.delete(fk)
           end
         end

data/lib/engine.rb

@@ -1,6 +1,5 @@
 require 'haml'
-require 'will_paginate'
-require 'will_paginate/view_helpers/action_view'
+require 'kaminari'
 
 module Bhf
   class Engine < Rails::Engine