visit_card 0.0.1 → 0.1.0

data/README.rdoc

@@ -4,12 +4,20 @@ Manage visit cards in your app.
 VCard standart (RFC 2426) realization through Rails 3 Engines.
 Supports export to hCard microformat.
 
+If you want parse telephone format add phone gem (http://github.com/carr/phone) to your Gemfile:
+  gem 'phone'
+
+Then setup at config/initializers/phone.rb. For example:
+  Phone.default_country_code = '380'
+  Phone.default_area_code = '57'
+  Phone.named_formats[:ua] = '+%c-%a-%f-%l'
+  
+If you want choose country through select box install country_select plugin.
+
 == TODO
 * Move out styles and javascript from views.
 * Improve hCard microformat export. Move to Builder.
 * Add I18n support.
-* Add localized_country_select plugin support.
-* Add phone gem support.
 * Import/Export VCard.
 * Test suite.
 * Improve Generators. Add seeds generator.

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "pavel.chipiga@gmail.com"
     gem.homepage = "http://github.com/chipiga/visit_card"
     gem.authors = ["Pavel Chipiga"]
-    gem.add_dependency "bitmask-attribute", ">= 1.2.0"
+    gem.add_dependency "clean-bitmask-attribute", ">= 2.0.0"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/app/models/vcard_extension.rb

@@ -0,0 +1,3 @@
+class VcardExtension < ActiveRecord::Base
+  include VisitCard::Models::VcardExtension
+end

data/app/views/visit_card/vcard_adrs/_form_fields.html.erb

@@ -2,7 +2,7 @@
   <legend>Address</legend>
   <ol>
     <li class="field">
-      <%= ff.check_box_collection :types, VcardAdr::TYPES %>
+      <%= ff.check_box_collection :types, VisitCard.adr_types %>
     </li>
     <li class="field">
       <%= ff.label :post_office_box %>
@@ -30,7 +30,8 @@
     </li>
     <li class="field">
       <%= ff.label :country_name %>
-      <%= ff.text_field :country_name %> <!-- TODO select -->
+      <%= ff.respond_to?(:country_select) ? ff.country_select(:country_name, [], :include_blank => true) : ff.text_field(:country_name) 
+      %>
     </li>
   </ol>
   <%= ff.hidden_field :_destroy, :value => '' %>

data/app/views/visit_card/vcard_emails/_form_fields.html.erb

@@ -2,7 +2,7 @@
   <legend>Email</legend>
   <ol>
     <li class="field">
-      <%= ff.check_box_collection :types, VcardEmail::TYPES %>
+      <%= ff.check_box_collection :types, VisitCard.email_types %>
     </li>
     <li class="field">
       <%= ff.label :value %>

data/app/views/visit_card/vcard_extensions/_form_fields.html.erb

@@ -0,0 +1,18 @@
+<fieldset class="inputs extension">
+  <legend>Extension</legend>
+  <ol>
+    <li class="field">
+      <%= ff.check_box_collection :types, VisitCard.extension_types %>
+    </li>
+    <li class="field">
+      <%= ff.label :vcard_extension_type %>
+      <%= ff.select :vcard_dictionary_id, VcardDictionary.extension_types.map{|e| [e.name, e.id]} %>
+    </li>
+    <li class="field">
+      <%= ff.label :value %>
+      <%= ff.text_field :value %>
+    </li>
+  </ol>
+  <%= ff.hidden_field :_destroy, :value => '' %>
+  <a href='#' class='remove'>Remove</a>
+</fieldset>

data/app/views/visit_card/vcard_tels/_form_fields.html.erb

@@ -2,7 +2,7 @@
   <legend>Telephone</legend>
   <ol>
     <li class="field">
-      <%= ff.check_box_collection :types, VcardTel::TYPES %>
+      <%= ff.check_box_collection :types, VisitCard.tel_types %>
     </li>
     <li class="field">
       <%= ff.label :value %>

data/app/views/visit_card/vcards/_form.html.erb

@@ -46,6 +46,10 @@
         <%= f.date_select :bday, :start_year => Time.now.year - 80, :end_year => Time.now.year, :include_blank => true %>
       </li>
 
+      <li class="field">
+        <%= f.label :mailer %>
+        <%= f.text_field :mailer %>
+      </li>
       <li class="field">
         <%= f.label :tz %>
         <%= f.time_zone_select :tz, nil, :include_blank => true %>
@@ -74,9 +78,13 @@
         <%= f.label :agent %>
         <%= f.select :agent_id, Vcard.except(params[:id]).collect {|v| [ v.fn, v.id ] }, :include_blank => true %>
       </li>
+      <li class="field required">
+        <%= f.label :organization_name %>
+        <%= f.text_field :organization_name %>
+      </li>
       <li class="field">
-        <%= f.label :org %>
-        <%= f.text_field :org %>
+        <%= f.label :organization_unit %>
+        <%= f.text_field :organization_unit %>
       </li>
       <li class="field">
         <%= f.check_box_collection :vcard_categories, Hash[ *VcardDictionary.categories.collect { |d| [ d.id, d.name ] }.flatten ] %>
@@ -85,13 +93,29 @@
         <%= f.label :note %>
         <%= f.text_area :note %>
       </li>
+      <li class="field">
+        <%= f.label :sort_string %>
+        <%= f.text_field :sort_string %>
+      </li>
+      <li class="field">
+        <%= f.label :sound %>
+        <%= f.text_field :sound %>
+      </li>
+      <li class="field">
+        <%= f.label :uid %>
+        <%= f.text_field :uid %>
+      </li>
       <li class="field">
         <%= f.label :url %>
         <%= f.url_field :url %>
       </li>
       <li class="field">
         <%= f.label :klass %>
-        <%= f.select :klass, Vcard::VCARD_KLASSES %>
+        <%= f.select :klass, VisitCard.klasses %>
+      </li>
+      <li class="field">
+        <%= f.label :key %>
+        <%= f.text_field :key %>
       </li>
 
       <% %w{adrs tels emails extensions}.each do |item| %>

data/app/views/visit_card/vcards/index.html.erb

@@ -3,13 +3,11 @@
 <table>
   <tr>
     <th>FN</th>
-    <th>ORG</th>
     <th>Action</th>
   </tr>
 <% @vcards.each do |vcard| %>
   <tr>
     <td><%= link_to(vcard.fga, vcard) %></td>
-    <td><%= vcard.org %></td>
     <td><%= link_to 'Edit', edit_vcard_path(vcard) %> | <%= link_to 'Destroy', vcard, :confirm => 'Are you sure?', :method => :delete %></td>
   </tr>
 <% end %>

data/lib/generators/visit_card/vcard/templates/migration.rb

@@ -13,16 +13,22 @@ class Create<%= table_name.camelize %>Tables < ActiveRecord::Migration
       t.string :nickname
       t.text :photo
       t.date :bday
+      t.string :mailer
       t.string :tz
       t.float :latitude
       t.float :longitude
       t.string :title
       t.string :role
       t.text :logo
-      t.string :org
+      t.string :organization_name
+      t.string :organization_unit
       t.text :note
+      t.string :sort_string
+      t.text :sound
+      t.string :uid
       t.string :url
       t.string :klass
+      t.text :key
 
       t.timestamps
     end

data/lib/visit_card/models/vcard.rb

@@ -3,7 +3,6 @@ module VisitCard
     module Vcard
       extend ActiveSupport::Concern
 
-      VCARD_KLASSES = %w{public private confidential}
       VCARD_NESTED_ATTRIBUTES_REJECT_IF = lambda {|a| a.reject{|k,v| k.include?('types') || k.include?('_id')}.all? {|_, v| v.blank?}}
 
       included do
@@ -15,7 +14,7 @@ module VisitCard
         has_many :vcard_extensions, :dependent => :destroy
         belongs_to :agent, :class_name => 'Vcard', :foreign_key => 'agent_id'
 
-        validates :family_name, :given_name, :presence => true
+        validate :validates_fn # validates :family_name, :given_name, :presence => true
         validates_numericality_of :latitude, :longitude, :allow_nil => true
         validates_format_of :photo, :logo, :url, :with => URI::regexp(%w{http https}), :allow_blank => true, :allow_nil => true
 
@@ -24,6 +23,7 @@ module VisitCard
 
         scope :except, lambda {|id| id.blank? ? where('1 = 1') : where('id <> ?', (::Vcard.find(id).id rescue 0))} # for slugs support
         # scope :excepts, lambda {|*ids| ids.compact.blank? ? where('1 = 1') : where('id NOT IN(?)', ids.join(','))}
+        scope :sort_string_asc, order('sort_string ASC')
 
         accepts_nested_attributes_for :vcard_adrs, :vcard_tels, :vcard_emails, :vcard_extensions,
                                       :reject_if => VCARD_NESTED_ATTRIBUTES_REJECT_IF, :allow_destroy => true
@@ -31,7 +31,8 @@ module VisitCard
 
       module InstanceMethods
         def fn
-          "#{honorific_prefix} #{given_name} #{additional_name ? additional_name << ' ': ''}#{family_name} #{honorific_suffix}".strip
+          fn = "#{honorific_prefix} #{given_name} #{additional_name} #{family_name} #{honorific_suffix}".squeeze(' ').strip
+          fn ? fn : org
         end
 
         def n
@@ -42,11 +43,84 @@ module VisitCard
           "#{family_name} #{given_name} #{additional_name}".strip
         end
 
-        # TODO move to separate builder class
-        def to_hcard
-          out = ''
-          out << (url? ? "<a href='#{url}' class='fn url'>#{fn}</a>" : "<span class='fn'>#{fn}</span>")
-          out.html_safe
+        def geo
+          result = "#{latitude};#{longitude}"
+          result == ';' ? '' : result
+        end
+
+        def label
+          "#{fn}\n#{vcard_adrs.first.adr.squeeze(';').gsub(';','\n')}".strip
+        end
+
+        def org
+          organization_unit? ? "#{organization_name};#{organization_unit}" : organization_name
+        end
+
+        # TODO support two variants of category store - through habtm & simple string
+        # def category
+        # end
+
+        def rev
+          updated_at
+        end
+
+        # TODO refactor! template?
+        # TODO separate and improve geo, org
+        # TODO add photo, logo, tz, category, extensions
+        def to_hcard(options = {}, &block)
+          result = []
+          clasess = ['fn']
+          clasess << 'org' if org == fn
+          if url?
+            clasess << 'url'
+            result << "<a class='#{clasess.join(' ')}' href='#{url}'>#{fn}</a>"
+          else
+            result << "<span class='#{clasess.join(' ')}'>#{fn}</span>"
+          end
+          result << "(<span class='nickname'>#{nickname}</span>)" if nickname?
+          result << "<abbr class='bday' title='#{bday.to_s}'>#{I18n.l(bday, :format => :long)}</abbr>" if bday?
+          result << "<span class='title'>#{title}</span>" if title?
+          result << "<span class='role'>#{role}</span>" if role?
+          result << "<span class='org'>#{org}</span>" if org.present? && org != fn
+          vcard_adrs.each do |adr|
+            result << adr.to_hcard
+          end
+          result << "<abbr class='geo' title='#{geo}'>Location</abbr>" if geo.present?
+          # result << "<span class='geo'><abbr class='latitude' title='#{latitude}'>N 48° 81.6667</abbr><abbr class='longitude' title='2.366667'>E 2° 36.6667</abbr></span>" if geo.present?
+          vcard_tels.each do |tel|
+            result << tel.to_hcard
+          end
+          vcard_emails.each do |email|
+            result << email.to_hcard
+          end
+          # result.compact!
+          result << agent.to_hcard if agent_id? # TODO add agent class?
+          main_tag_name = options.fetch(:main_tag_name, 'div')
+          ("<#{main_tag_name} class='vcard'>" << result.join(' ') << "</#{main_tag_name}>").html_safe          
+        end
+
+        # TODO proxy to parser
+        def from_hcard()
+        end
+
+        # TODO
+        def to_vcard
+        end
+
+        # TODO
+        def from_vcard()
+        end
+
+        protected
+
+        def validates_fn
+          if family_name.blank? && given_name.blank? && additional_name.blank? && honorific_prefix.blank? && honorific_suffix.blank?
+            errors.add(:organization_name) unless organization_name?
+          else
+            errors.add(:family_name) unless family_name?
+            errors.add(:given_name) unless given_name?
+            errors.add(:organization_name) if organization_unit?
+          end
         end
       end
 
@@ -55,3 +129,10 @@ module VisitCard
     end
   end
 end
+# class String
+#   def wrap_html(tag_name = 'span', options = {})
+#     options[:class] ||= self
+#     options.each{}
+#     "<#{tag_name}>#{self}</#{tag_name}>"
+#   end
+# end

data/lib/visit_card/models/vcard_adr.rb

@@ -3,14 +3,36 @@ module VisitCard
     module VcardAdr
       extend ActiveSupport::Concern
 
-      TYPES = %w{dom intl postal parcel home work pref}
-
       included do
         belongs_to :vcard
-        bitmask :types, :as => TYPES
+        bitmask :types, :as => VisitCard.adr_types
+        SERIALZABLE_ATTRIBUTES = %w{post_office_box extended_address street_address locality region postal_code country_name}
       end
 
       module InstanceMethods
+        def adr
+          # "#{post_office_box};#{extended_address};#{street_address};#{locality};#{region};#{postal_code};#{country_name}"
+          SERIALZABLE_ATTRIBUTES.join(';')
+        end
+        
+        def to_hcard(options = {})
+          result = []
+          result << "<span class='type'>#{types.join(', ').titleize}</span>" unless types.empty?
+          tag_name = options.fetch(:tag_name, 'span')
+          SERIALZABLE_ATTRIBUTES.each do |attr_name|
+            result << wrap_attribute(attr_name, tag_name)
+          end
+          result.compact!
+          main_tag_name = options.fetch(:main_tag_name, 'div')
+          ("<#{main_tag_name} class='adr'>" << result.join(' ') << "</#{main_tag_name}>").html_safe
+        end
+
+        private
+
+        def wrap_attribute(attr_name, tag_name = 'span')
+          value = send(attr_name.to_sym)
+          value.present? ? "<#{tag_name} class='#{attr_name.gsub('_','-')}'>#{value}</#{tag_name}>" : nil
+        end
       end
 
       module ClassMethods

data/lib/visit_card/models/vcard_dictionary.rb

@@ -3,8 +3,6 @@ module VisitCard
     module VcardDictionary
       extend ActiveSupport::Concern
 
-      KLASSES = %w{category extension_type}
-
       included do
         validates :klass, :name, :presence => true
         validates_uniqueness_of :name, :scope => :klass

data/lib/visit_card/models/vcard_email.rb

@@ -3,15 +3,21 @@ module VisitCard
     module VcardEmail
       extend ActiveSupport::Concern
 
-      TYPES = %w{internet x400 pref}
-
       included do
         belongs_to :vcard
         validates_format_of :value, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :allow_blank => true, :allow_nil => true
-        bitmask :types, :as => TYPES
+        bitmask :types, :as => VisitCard.email_types
       end
 
       module InstanceMethods
+        def to_hcard(options = {})
+          result = []
+          result << "<span class='type'>#{types.join(', ').titleize}</span>" unless types.empty?
+          tag_name = options.fetch(:tag_name, 'a')
+          result << "<#{tag_name} class='value' href='mailto:#{value}'>#{value}</#{tag_name}>"
+          main_tag_name = options.fetch(:main_tag_name, 'div')
+          ("<#{main_tag_name} class='email'>" << result.join(' ') << "</#{main_tag_name}>").html_safe
+        end
       end
 
       module ClassMethods

data/lib/visit_card/models/vcard_extension.rb

@@ -0,0 +1,20 @@
+module VisitCard
+  module Models
+    module VcardExtension
+      extend ActiveSupport::Concern
+
+      included do
+        belongs_to :vcard
+        belongs_to :vcard_extension_type, :class_name => 'VcardDictionary'
+        validates :vcard_extension_type, :presence => true
+        bitmask :types, :as => VisitCard.extension_types
+      end
+
+      module InstanceMethods
+      end
+
+      module ClassMethods
+      end
+    end
+  end
+end

data/lib/visit_card/models/vcard_tel.rb

@@ -3,15 +3,27 @@ module VisitCard
     module VcardTel
       extend ActiveSupport::Concern
 
-      TYPES = %w{home msg work pref voice fax cell video pager bbs modem car isdn pcs}
-
       included do
         belongs_to :vcard
-        # TODO phone format parse and validate
-        bitmask :types, :as => TYPES
+        before_validation :parse_phone
+        bitmask :types, :as => VisitCard.tel_types
       end
 
       module InstanceMethods
+        def to_hcard(options = {})
+          result = []
+          result << "<span class='type'>#{types.join(', ').titleize}</span>" unless types.empty?
+          tag_name = options.fetch(:tag_name, 'span')
+          result << "<#{tag_name} class='value'>#{value}</#{tag_name}>"
+          main_tag_name = options.fetch(:main_tag_name, 'div')
+          ("<#{main_tag_name} class='tel'>" << result.join(' ') << "</#{main_tag_name}>").html_safe
+        end
+
+        protected
+
+        def parse_phone
+          self.value = Phone.parse(value).to_s if defined? Phone
+        end
       end
 
       module ClassMethods

data/lib/visit_card.rb

@@ -3,6 +3,21 @@ require 'bitmask-attribute'
 module VisitCard
   VCARD_VERSION = '3.0'
 
+  mattr_accessor :klasses
+  @@klasses = %w{public private confidential}
+
+  mattr_accessor :adr_types
+  @@adr_types = %w{dom intl postal parcel home work pref}
+
+  mattr_accessor :email_types
+  @@email_types = %w{internet x400 pref}
+
+  mattr_accessor :extension_types
+  @@extension_types = %w{home msg work pref voice video pager pcs internet other}
+
+  mattr_accessor :tel_types
+  @@tel_types = %w{home msg work pref voice fax cell video pager bbs modem car isdn pcs}
+
   module Models
     extend ActiveSupport::Autoload
 

data/visit_card.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{visit_card}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pavel Chipiga"]
-  s.date = %q{2010-07-02}
+  s.date = %q{2010-07-06}
   s.description = %q{Rails 3 engines plugin for VCard store and managment}
   s.email = %q{pavel.chipiga@gmail.com}
   s.extra_rdoc_files = [
@@ -30,9 +30,11 @@ Gem::Specification.new do |s|
      "app/models/vcard_categorization.rb",
      "app/models/vcard_dictionary.rb",
      "app/models/vcard_email.rb",
+     "app/models/vcard_extension.rb",
      "app/models/vcard_tel.rb",
      "app/views/visit_card/vcard_adrs/_form_fields.html.erb",
      "app/views/visit_card/vcard_emails/_form_fields.html.erb",
+     "app/views/visit_card/vcard_extensions/_form_fields.html.erb",
      "app/views/visit_card/vcard_tels/_form_fields.html.erb",
      "app/views/visit_card/vcards/_form.html.erb",
      "app/views/visit_card/vcards/_hcard.html.erb",
@@ -54,6 +56,7 @@ Gem::Specification.new do |s|
      "lib/visit_card/models/vcard_categorization.rb",
      "lib/visit_card/models/vcard_dictionary.rb",
      "lib/visit_card/models/vcard_email.rb",
+     "lib/visit_card/models/vcard_extension.rb",
      "lib/visit_card/models/vcard_tel.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
@@ -75,14 +78,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bitmask-attribute>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<clean-bitmask-attribute>, [">= 2.0.0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
-      s.add_dependency(%q<bitmask-attribute>, [">= 1.2.0"])
+      s.add_dependency(%q<clean-bitmask-attribute>, [">= 2.0.0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
-    s.add_dependency(%q<bitmask-attribute>, [">= 1.2.0"])
+    s.add_dependency(%q<clean-bitmask-attribute>, [">= 2.0.0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: visit_card
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Pavel Chipiga
@@ -15,23 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 +03:00
+date: 2010-07-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bitmask-attribute
+  name: clean-bitmask-attribute
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 15
         segments: 
-        - 1
         - 2
         - 0
-        version: 1.2.0
+        - 0
+        version: 2.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -73,9 +73,11 @@ files:
 - app/models/vcard_categorization.rb
 - app/models/vcard_dictionary.rb
 - app/models/vcard_email.rb
+- app/models/vcard_extension.rb
 - app/models/vcard_tel.rb
 - app/views/visit_card/vcard_adrs/_form_fields.html.erb
 - app/views/visit_card/vcard_emails/_form_fields.html.erb
+- app/views/visit_card/vcard_extensions/_form_fields.html.erb
 - app/views/visit_card/vcard_tels/_form_fields.html.erb
 - app/views/visit_card/vcards/_form.html.erb
 - app/views/visit_card/vcards/_hcard.html.erb
@@ -97,6 +99,7 @@ files:
 - lib/visit_card/models/vcard_categorization.rb
 - lib/visit_card/models/vcard_dictionary.rb
 - lib/visit_card/models/vcard_email.rb
+- lib/visit_card/models/vcard_extension.rb
 - lib/visit_card/models/vcard_tel.rb
 - spec/spec.opts
 - spec/spec_helper.rb