clndr-rails 1.2.5.1 → 1.2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f4e08bd446aef87926fe037c230a154f6005d34
-  data.tar.gz: bf1c82662950f69dcf29c3822376673caae502c8
+  metadata.gz: bcfb9af88681840cc8a39d9d5f58419cc23c3cb7
+  data.tar.gz: 6d3638267750032a543e264c8a92f82692007fa1
 SHA512:
-  metadata.gz: cc1455a0d01001920d0c521644331f7d1ba120c72677d4fa1e5988d9b6bf9a00fabf007e2f5765f05ae719116b48f302345c3a832c4a805a7e64ee0c090cdae6
-  data.tar.gz: 4238d1826dbc1cfd0a2a786c9c20196e59187dba8acb9cc29b6838a05bd8c8f9bd2626a095800bd3118184cbe6c44e569e17bb0cdf2e128d8e29857af81321cd
+  metadata.gz: e119b9ce2449950f9ca131068d076a9070db30459a99ca5ffd5efe73dbe58ee22a394f5faf9068c879bb8951722f4deedaad06c67d3a6798bda9d0b504e638be
+  data.tar.gz: 906b7581355652dbcf9b1e38c20cee95969a09bb659076e51992485811030cd0b4275f6d5ae87a06864d3f6294d30b073fa4db6318706305fb62d8a9354140fa

data/Rakefile

@@ -1,2 +1,11 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'
+
+require 'rake'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = Dir.glob('test/spec/**/*_spec.rb')
+  t.rspec_opts = '--format documentation --color'
+
+end
+task :default => :spec

data/lib/clndr-rails.rb

@@ -1,171 +1,196 @@
-require 'clndr-rails/engine'
-require "clndr-rails/version"
-require 'clndr-rails/errors'
-
-
-require 'momentjs-rails'
-require 'jquery-rails'
-require 'underscore-rails'
-
-class Clndr
-
-  autoload :Helpers, 'clndr-rails/helpers'
-  autoload :Template, 'clndr-rails/templates'
-  require 'clndr-rails/config'
-
-
-  include ActionView::Helpers
-  include ActionView::Context
-  include ActiveSupport::Inflector
-  @@calendar_bean = {}
-
-  class << self
-
-    attr_accessor :calendar_bean
-
-    # return calendar from calendars bean
-    def get_calendar(calendar)
-      clndr = @@calendar_bean[calendar.to_sym]
-      if clndr.class == Clndr
-        clndr
-      else
-        raise Clndr::Error::CalendarNotFound, "Calndear with name #{calendar} not found. Use Clndr.new(:#{calendar}) to create them"
-      end
-    end
-  end
-
-  attr_accessor :template, :weak_offset, :days_of_the_weak,:show_adjacent_months, :adjacent_days_change_month, :done_rendering, :events, :constraints
-  attr_reader :name
-
-
-
-  def initialize(name)
-    @name = name.to_sym
-    @template = @@template
-    @weak_offset = @@weak_offset
-    @start_with_month =@@start_with_month
-    @days_of_the_weak = @@days_of_the_weak
-    @click_events = @@click_events.clone
-    @targets= @@targets.clone
-    @show_adjacent_months= @@show_adjacent_months
-    @adjacent_days_change_month = @@adjacent_days_change_month
-    @done_rendering = @done_rendering
-    @constraints =@@constraints
-    @force_six_rows =@@force_six_rows
-    @has_multiday= false
-    @events =[]
-    @@calendar_bean.merge! Hash[@name,self]
-  end
-
-  #   return html of calendar
-  def view(args)
-    if @template == Clndr::Template::Full
-      css_class = 'full-clndr-template'
-    elsif @template == Clndr::Template::Mini
-      css_class = 'mini-clndr-template'
-    elsif @template == Clndr::Template::Simple
-      css_class = 'simple-clndr-template'
-    end
-    content_tag(:div,nil,args)do
-      content_tag(:div,nil,id:"#{@name}-clndr",class:"clearfix #{css_class}")+
-      javascript_tag("var #{@name} = $('##{@name}-clndr').clndr({
-        #{'template:'+@template+',' if !@template.nil?}
-        #{'weekOffset:'+@weak_offset.to_s+',' if @weak_offset}
-        #{'startWithMonth:\''+@start_with_month.to_s+'\',' if !@start_with_month.nil?}
-        #{'daysOfTheWeek:'+@days_of_the_weak.to_s+',' if !@days_of_the_weak.nil?}
-        #{build_from_hash(@click_events,'clickEvents')}
-        #{build_from_hash_safety(@targets,'targets')}
-        #{'showAdjacentMonths:'+@show_adjacent_months.to_s+',' if !@show_adjacent_months}
-        #{'adjacentDaysChangeMonth:'+@adjacent_days_change_month.to_s+',' if @adjacent_days_change_month}
-        #{'doneRendering:'+@done_rendering+',' if !@done_rendering.nil?}
-        #{'forceSixRows:'+@force_six_rows.to_s+',' if @force_six_rows}
-        #{ if @constraints.length >0
-             build_from_hash_safety @constraints, 'constraints'
-           end}
-        #{if @has_multiday
-          "multiDayEvents: {
-            startDate: 'startDate',
-            endDate: 'endDate'
-          },"
-                   end}
-        #{if @events.length > 0
-            'events:['+build_events(@events)+']'
-          end}
-          });")
-
-
-      end
-  end
-
-  # if date is instance of Time convert to "YYYY-MM-DD" формат
-  def start_with_month=(date)
-    if date.class == Time
-      @start_with_month= date.strftime("%F")
-    else
-      @start_with_month = date
-    end
-  end
-
-  def click_event
-    @click_events
-  end
-
-  def target
-    @targets
-  end
-
-  def add_event(date,title,*other_data)
-    date = format_date date
-    event = {date: date,title:title}
-    event.merge! *other_data if other_data.length>0
-    @events.push event
-
-  end
-
-  def add_multiday_event(start_date,end_date,title,*other_data)
-    start_date = format_date start_date
-    end_date = format_date end_date
-    event = {start_date:start_date,end_date:end_date,title:title}
-    event.merge! *other_data if other_data.length >0
-    @has_multiday ||= true
-    @events.push event
-  end
-
-  private
-
-    def build_from_hash(hash, parametr)
-      if hash.length > 0
-        "#{parametr}: {#{hash.map{|k,v|"#{k}:#{v},"}.join()}},"
-      end
-    end
-
-  def build_from_hash_safety(hash, parametr)
-    if hash.length > 0
-      "#{parametr}: {#{hash.map{|k,v|"#{k}:'#{v}',"}.join()}},"
-    end
-  end
-
-  def build_events(array_of_events)
-    list_of_events=''
-    array_of_events.each do |event|
-      list_of_events +="{#{'date:\''+event.delete(:date)+'\',' if !event[:date].nil?}
-                          #{'startDate: \''+event.delete(:start_date)+'\','+
-                            'endDate: \'' + event.delete(:end_date)+'\','if !event[:start_date].nil?}
-                          title: '#{event.delete(:title)}',
-                          #{event.map{|k,v| "#{k}:'#{v}'"}.join(',')}},"
-    end
-    # @events = nil
-    list_of_events
-  end
-
-  def format_date(date)
-    if date.class == Time
-      date.strftime("%F")
-    elsif date.match(/\d{4}\-\d{2}\-\d{2}/)
-      date
-    else
-      raise Clndr::Error::WrongDateFormat
-    end
-  end
-
-end
+require 'clndr-rails/engine'
+require 'clndr-rails/version'
+require 'clndr-rails/errors'
+
+
+require 'momentjs-rails'
+require 'jquery-rails'
+require 'underscore-rails'
+
+class Clndr
+
+  autoload :Helpers, 'clndr-rails/helpers'
+  autoload :Template, 'clndr-rails/templates'
+  require 'clndr-rails/config'
+
+
+
+  include ActionView::Helpers
+  include ActionView::Context
+  include ActiveSupport::Inflector
+  @@calendar_basket = {}
+  cattr_reader :calendar_basket
+
+  class << self
+
+    # return calendar from calendars bean
+    def get_calendar(calendar)
+      clndr = @@calendar_basket[calendar.to_sym]
+      if clndr.class == Clndr
+        clndr
+      else
+        raise Clndr::Error::CalendarNotFound, "Calendar with name #{calendar} not found. Use Clndr.new(:#{calendar}) to create them"
+      end
+    end
+  end
+
+  attr_accessor :template, :week_offset, :days_of_the_week,
+                :show_adjacent_months, :adjacent_days_change_month,
+                :done_rendering, :force_six_rows, :start_with_month
+  attr_reader :name, :events
+
+
+
+  def initialize(name)
+    @name = name.to_sym
+    @template = @@template
+    @week_offset = @@week_offset
+    @start_with_month =@@start_with_month
+    @days_of_the_week = @@days_of_the_week
+    @click_events = @@click_events.clone
+    @targets= @@targets.clone
+    @show_adjacent_months= @@show_adjacent_months
+    @adjacent_days_change_month = @@adjacent_days_change_month
+    @done_rendering = @@done_rendering
+    @constraints =@@constraints
+    @force_six_rows =@@force_six_rows
+    @has_multiday= false
+    @events =[]
+    @@calendar_basket.merge! Hash[@name,self]
+  end
+
+  #   return html of calendar
+  def view(args=nil)
+
+    case @template
+      when Clndr::Template::FULL
+        css_class = 'full-clndr-template'
+      when Clndr::Template::MINI
+        css_class = 'mini-clndr-template'
+      when Clndr::Template::SIMPLE
+        css_class = 'simple-clndr-template'
+      else
+        css_class = 'blank-clndr-template'
+    end
+
+    content_tag(:div,nil,args)do
+      content_tag(:div,nil,id:"#{@name}-clndr",class:"clearfix #{css_class}")+
+      javascript_tag("var #{@name} = $('##{@name}-clndr').clndr({
+        #{'template:'+@template+',' unless @template.nil?}
+        #{'weekOffset:'+@week_offset.to_s+',' if @week_offset==1}
+        #{'startWithMonth:\''+@start_with_month.to_s+'\',' unless @start_with_month.nil?}
+        #{'daysOfTheWeek:'+@days_of_the_week.to_s+',' unless @days_of_the_week.nil?}
+        #{build_from_hash(@click_events,'clickEvents')}
+        #{build_from_hash(@targets,'targets',true)}
+        #{'showAdjacentMonths:'+@show_adjacent_months.to_s+',' unless @show_adjacent_months}
+        #{'adjacentDaysChangeMonth:'+@adjacent_days_change_month.to_s+',' if @adjacent_days_change_month}
+        #{'doneRendering:'+@done_rendering+',' unless @done_rendering.nil?}
+        #{'forceSixRows:'+@force_six_rows.to_s+',' if @force_six_rows}
+        #{ if @constraints.length >0
+             build_from_hash @constraints, 'constraints', true
+           end}
+        #{if @has_multiday
+          "multiDayEvents: {
+            startDate: 'startDate',
+            endDate: 'endDate'
+          },"
+                   end}
+        #{if @events.length > 0
+            'events:['+build_events+']'
+          end}
+          });".gsub(/\n\s*\n/,"\n"))
+
+
+      end
+  end
+
+  def week_offset=(boolean)
+    if boolean
+      @week_offset=1
+    else
+      @week_offset =0
+    end
+  end
+
+  # if date is instance of Time convert to "YYYY-MM-DD" format
+  def start_with_month=(date)
+      @start_with_month = Clndr.date_format date
+  end
+
+  # access to click_events hash
+  def click_event
+    @click_events
+  end
+
+  # access to targets hash
+  def target
+    @targets
+  end
+
+  def constraints_start
+    @constraints[:startDate]
+  end
+
+  def constraints_start=(date)
+    @constraints[:startDate] = Clndr.date_format date
+  end
+
+  def constraints_end
+    @constraints[:endDate]
+  end
+
+  def constraints_end=(date)
+    @constraints[:endDate] = Clndr.date_format date
+  end
+
+  # add event to events array
+  # *other_data some data for tour access in template
+  def add_event(date,title,*other_data)
+    date = Clndr.date_format date
+    event = {date: date,title:title}
+    event.merge! *other_data if other_data.length>0
+    @events.push event
+
+  end
+
+  # add multiday event
+  def add_multiday_event(start_date,end_date,title,*other_data)
+    start_date = Clndr.date_format start_date
+    end_date = Clndr.date_format end_date
+    event = {start_date:start_date,end_date:end_date,title:title}
+    event.merge! *other_data if other_data.length >0
+    @has_multiday ||= true
+    @events.push event
+  end
+
+  private
+
+    # build string from hash to parameter
+    # this unsafe method use only for function or true/false value
+    # if you need generate js string (eg param:'some value') use
+    # .build_from_hash_safety
+    def build_from_hash(hash, parameter,safety=false)
+      if hash.length > 0
+        "#{parameter}: {#{hash.map { |k, v| "#{k}:#{'\'' if safety}#{v}#{'\'' if safety}," }.join}},"
+      end
+    end
+
+
+  # generate events array from @event
+  def build_events
+    list_of_events=''
+    @events.delete_if do |event|
+      list_of_events +="{
+          #{'date:\''+event.delete(:date)+'\',' unless event[:date].nil?}
+          #{'startDate: \''+event.delete(:start_date)+'\','+
+              'endDate: \'' + event.delete(:end_date)+'\',' unless event[:start_date].nil?}
+          title: '#{event.delete(:title)}',
+          #{event.map{|k,v| "#{k}:'#{v}'"}.join(',')}},".gsub(/\n\s*\n/,"\n")
+
+    end
+
+    # return string with events
+    list_of_events
+  end
+end
+

data/lib/clndr-rails/config.rb

@@ -1,8 +1,20 @@
 class Clndr
 
+  # check date to available format
+  # if date is Time instance, convert to available string
+  def self.date_format(date)
+    if date.class == Time
+      date.strftime('%F')
+    elsif date.match(/\d{4}\-\d{2}\-\d{2}/)
+      date
+    else
+      raise Clndr::Error::WrongDateFormat
+    end
+  end
+
   # default config
-  @@template = Clndr::Template::Blank
-  @@weak_offset = true
+  @@template = Clndr::Template::BLANK
+  @@week_offset = 1
   @@start_with_month = nil
   @@days_of_the_week = nil
   @@click_events={}
@@ -13,9 +25,10 @@ class Clndr
   @@constraints ={}
   @@force_six_rows= true
 
-
-
-   def self.configure
+  # todo check days of week for 7 length
+  # todo check for available events and targets
+  # rails like config
+  def self.configure
     yield self
   end
 
@@ -23,36 +36,34 @@ class Clndr
     @@template ||= template
   end
 
-  def self.weak_offset=(offset)
+  def self.week_offset=(offset)
+
+    # convert offset to CLNDR format
     if offset
-      @@weak_offset = 1
+      @@week_offset = 1
     else
-      @@weak_offset = 0
+      @@week_offset = 0
     end
   end
 
   def self.start_with_month=(date)
-    if date.class == Time
-      @@start_with_month=date.strftime("%F")
-    elsif date.match(/\d{4}\-\d{2}\-\d{2}/)
-      @@start_with_month = date
-    else
-      raise Clndr::Error::WrongDateFormat
-    end
+    @@start_with_month = date_format date
   end
 
-  def self.days_of_the_weak=(array_of_days)
-    @@days_of_the_weak=array_of_days
+  def self.days_of_the_week=(array_of_days)
+    @@days_of_the_week=array_of_days
   end
 
   def self.show_adjacent_months=(boolean)
     @@show_adjacent_months = boolean
   end
 
+  # access to click_events hash
   def self.click_events
     yield @@click_events
   end
 
+  # access to target hash
   def self.targets
     yield @@targets
   end
@@ -61,32 +72,35 @@ class Clndr
     @@adjacent_days_change_month= boolean
   end
 
-  def self.done_rendering=(jsfnction)
-    @@done_rendering = jsfnction
+  def self.done_rendering=(jsfunction)
+    @@done_rendering = jsfunction
   end
 
   def self.constraints_start=(date)
-    if date.class == Time
-      @@constraints[:startDate]=date.strftime("%F")
-    elsif date.match(/\d{4}\-\d{2}\-\d{2}/)
-      @@constraints[:startDate]=date
-    else
-      raise Clndr::Error::WrongDateFormat
-    end
+    @@constraints[:startDate]= date_format date
   end
 
   def self.constraints_end=(date)
-    if date.class == Time
-      @@constraints[:endDate]=date.strftime("%F")
-    elsif date.match(/\d{4}\-\d{2}\-\d{2}/)
-      @@constraints[:endDate]=date
-    else
-      raise Clndr::Error::WrongDateFormat
-    end
+    @@constraints[:endDate]= date_format date
   end
 
-  def forceSixRows=(boolean)
+  def self.force_six_rows=(boolean)
     @@force_six_rows= boolean
   end
 
+  def self.default_settings
+    @@template = Clndr::Template::BLANK
+    @@week_offset = 1
+    @@start_with_month = nil
+    @@days_of_the_week = nil
+    @@click_events={}
+    @@targets={}
+    @@show_adjacent_months= true
+    @@adjacent_days_change_month=false
+    @@done_rendering=nil
+    @@constraints ={}
+    @@force_six_rows= true
+    self
+  end
+
 end