buzztools 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eaae1e1dab86ea0752de2655f0a62b0f20662ac
-  data.tar.gz: 113bda67b24d33fddcc40cbc4336c71acbcbe601
+  metadata.gz: aff31eabe68efa1e5a445bd12d0f9f396848eeb1
+  data.tar.gz: 2d2c6a0ade3692dd6df4a67f09a3822bea65e9f7
 SHA512:
-  metadata.gz: 03b1c16af683d35b6aaf30f396b902cee0b89df02c58a7c2017c696bf7524558c90f59bc118ce6744f1fc42cbfff087fd0d099caa3e7d932edeabf04aea0e28b
-  data.tar.gz: cb5dd2f7db57b298bfdbe41c8e1037d9c39dd711e1a91cb484007991383877e917ab1599b707c34e7c543eba0629d6c14e4cdf9bbec0758ae06c65e4f8f1d005
+  metadata.gz: 2565d3962a392389d285bf4dd57405270d41440eeda228dc4dd998c30876151bd129a212aa89545f343865b91f132169eb3d892f1c49b7e36e729b38edab1134
+  data.tar.gz: 752a338ddd6d7051aa953e87705239821313e8fc1a4b7fbf681343e5c08dd3a7f8a319636fda95f01fe5618c2a84c18e4229c14cf799dbaf84f842cdcf8d3738

data/.idea/copyright/profiles_settings.xml

@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="" />
+</component>

data/lib/buzztools/extend_time.rb

@@ -1,17 +1,41 @@
 Time.class_eval do
 
-	if !respond_to?(:change)  # no activesupport loaded
+	if !method_defined?(:change)  # no activesupport loaded
 		def change(options)
-			::Time.send(
-				self.utc? ? :utc : :local,
-				options[:year]  || self.year,
-				options[:month] || self.month,
-				options[:day]   || self.day,
-				options[:hour]  || self.hour,
-				options[:min]   || (options[:hour] ? 0 : self.min),
-				options[:sec]   || ((options[:hour] || options[:min]) ? 0 : self.sec),
-				options[:usec]  || ((options[:hour] || options[:min] || options[:sec]) ? 0 : self.usec)
-			)
+			# ::Time.send(
+			# 	self.utc? ? :utc : :local,
+			# 	options[:year]  || self.year,
+			# 	options[:month] || self.month,
+			# 	options[:day]   || self.day,
+			# 	options[:hour]  || self.hour,
+			# 	options[:min]   || (options[:hour] ? 0 : self.min),
+			# 	options[:sec]   || ((options[:hour] || options[:min]) ? 0 : self.sec),
+			# 	options[:usec]  || ((options[:hour] || options[:min] || options[:sec]) ? 0 : self.usec)
+			# )
+
+			new_year  = options.fetch(:year, year)
+	    new_month = options.fetch(:month, month)
+	    new_day   = options.fetch(:day, day)
+	    new_hour  = options.fetch(:hour, hour)
+	    new_min   = options.fetch(:min, options[:hour] ? 0 : min)
+	    new_sec   = options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec)
+
+	    if new_nsec = options[:nsec]
+	      raise ArgumentError, "Can't change both :nsec and :usec at the same time: #{options.inspect}" if options[:usec]
+	      new_usec = Rational(new_nsec, 1000)
+	    else
+	      new_usec  = options.fetch(:usec, (options[:hour] || options[:min] || options[:sec]) ? 0 : Rational(nsec, 1000))
+	    end
+
+	    if utc?
+	      ::Time.utc(new_year, new_month, new_day, new_hour, new_min, new_sec, new_usec)
+	    elsif zone
+	      ::Time.local(new_year, new_month, new_day, new_hour, new_min, new_sec, new_usec)
+	    else
+	      raise ArgumentError, 'argument out of range' if new_usec > 999999
+	      ::Time.new(new_year, new_month, new_day, new_hour, new_min, new_sec + (new_usec.to_r / 1000000), utc_offset)
+	    end
+
 		end
 
 		def seconds_since_midnight

data/lib/buzztools/extras/versionary.rb

@@ -78,24 +78,17 @@ module Versionary
 
 			# should be able to do eg. : TaxRate.where(owner_id: 1,dealership_id: 2).latest_versions.where(state: 'WA')
 			scope :live_latest_versions, -> {
-				inner = clone.select("iid, max(version) as version").group(:iid).to_sql
-				ids = ActiveRecord::Base.connection.execute("select id from (#{inner}) as v inner join #{table_name} as t on t.iid = v.iid and t.version = v.version").to_a
-				if (adapter = ActiveRecord::Base.configurations[Rails.env]['adapter'])=='postgresql'
-					ids = ids.map{|i| i['id']}.join(',')
-				elsif adapter.begins_with? 'mysql'
-					ids = ids.flatten.join(',')
-				else
-					raise "Adapter #{adapter} not supported"
-				end
-
-				#ids = ActiveRecord::Base.connection.execute("select id from (SELECT iid, max(version) as version FROM `things` GROUP BY iid) as v inner join things as t on t.iid = v.iid and t.version = v.version").to_a.flatten.join(',')
-				where "id IN (#{ids})"
+				live_current_versions(nil)
 			}
 
 	    # Scopes to the current version for all iids at the given timestamp
 	    # This and other methods beginning with "live" do not use the ver_current column
+	    # if the timestamp is nil, it will return the highest available version regardless of current_from
 			scope :live_current_versions, ->(aTimestamp) {
-				inner = clone.select("iid, max(version) as version").where(["current_from <= ?",aTimestamp]).group(:iid).to_sql
+				aTimestamp = aTimestamp.to_ms if aTimestamp && aTimestamp.is_a?(Time)
+				inner = clone.select("iid, max(version) as version")
+				inner = inner.where(["current_from <= ?",aTimestamp]) if aTimestamp
+				inner = inner.group(:iid).to_sql
 				ids = ActiveRecord::Base.connection.execute("select id from (#{inner}) as v inner join #{table_name} as t on t.iid = v.iid and t.version = v.version").to_a
 				if (adapter = ActiveRecord::Base.configurations[Rails.env]['adapter'])=='postgresql'
 					ids = ids.map{|i| i['id']}.join(',')
@@ -126,6 +119,7 @@ module Versionary
 
 	    # Updates the ver_current column, which enables simpler and much faster queries on current versions eg. using current_versions instead of live_current_versions.
 	    # Must be run periodically eg. 4am daily
+	    # !!! probably should do something like this after every create_version!
 	    def self.update_all_ver_current
 		    self.update_all(ver_current: false)
 		    self.live_current_versions(Time.now.to_ms).update_all(ver_current: true)
@@ -161,4 +155,8 @@ module Versionary
 	def current_version
 		self.class.live_current_version(self.iid,KojacUtils.timestamp).first
 	end
+
+	def versions
+		self.class.where(iid: iid).order(:version)
+	end
 end

data/lib/buzztools/file.rb

@@ -93,9 +93,17 @@ module Buzztools
 			path_combine(aBasePath,aPath)
 		end
 
+		def is_root_path?(aPath)
+			# if is_windows?
+			# 	(aPath =~ /^[a-zA-Z]\:[\\\/]$/)==0
+			# else
+				aPath == '/'
+			# end
+		end
+
 		def path_parent(aPath)
 			return nil if is_root_path?(aPath)
-			append_slash(::File.dirname(remove_slash(expand_path(aPath))))
+			append_slash(::File.dirname(remove_slash(::File.expand_path(aPath))))
 		end
 
 		def simple_dir_name(aPath)
@@ -129,4 +137,4 @@ module Buzztools
 		end
 
 	end
-end
+end

data/lib/buzztools/version.rb

@@ -1,3 +1,3 @@
 module Buzztools
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buzztools
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Gary McGhee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".idea/copyright/profiles_settings.xml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -88,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: reusable function library