motion-accessibility 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6beccc1c387aea19480c7388b012b3ad3412288d
-  data.tar.gz: 63fb9668c4ec729c35ff3b288b9c7206e03aaec5
+  metadata.gz: 2e64727e1de692d10abb796a40266e58a754ecfc
+  data.tar.gz: 08d0987f4677c22bbb4dd790cc6d76dfea53cdfa
 SHA512:
-  metadata.gz: 749913c2a09f2358dea393e9a8bcde203d65277c5eb3c095ed8bfae229cf01239ecfb95d4ab54c2e4b3167a9348dba8725613dab75493314f4ec96abee195356
-  data.tar.gz: 6d57fc1b39a990a87489f1aec32bd020a27f45dff67d95ce27c3bafc9ef2aac178ce342bfd903e78ae74ed3da83a677d1f4496d8a5bcf0d65ab3030abfba2afb
+  metadata.gz: 30b3227b842bb63e39ef1aa1cb937c90075b76cf454c155e241d420c020d3b726e943ae46a7b42962f3af78833c06f8e84d2ee67b10323594fd3faad061496be
+  data.tar.gz: c69492392cf2101a301a2cb360b9d7f18d29ab14ca32796f65e884b5275d3e7116d0254d89a4652de513ad8e898b6a4bafd8be716690e1b2223735759a5318cb

data/lib/project/inspector.rb

@@ -3,6 +3,7 @@
 module Accessibility
 
 def self.inspect(obj)
+	return self.inspect(obj.get) if obj.is_a?(RubyMotionQuery::RMQ)
 displayed=[]
 if obj.class==Accessibility::Element
 attributes=A11y::Element_Attributes.dup
@@ -56,10 +57,10 @@ end
 end 
 
 def self.inspect_accessibility_traits(obj)
-	return obj.accessibility_traits if obj.accessibility_traits>Accessibility::Traits.values.max
+	return obj.accessibilityTraits if obj.accessibilityTraits>Accessibility::Traits.values.max
 traits=[]
 Accessibility::Traits.each do |trait, bitmask|
-if obj.accessibility_traits&bitmask>0
+if obj.accessibilityTraits&bitmask>0
 name=trait.gsub(/_/,' ').capitalize
 traits<<name
 end

data/lib/project/test.rb

@@ -80,7 +80,7 @@ quiet: false,
 			},
 				UINavigationBar: {
 				accessibility_label: nil,
-				accessibility_traits: ->(t){A11y::Test.nonstandard(t)},
+				accessibility_traits: :nonstandard,
 				accessibility_elements_hidden: false,
 				should_group_accessibility_children: true,
 				accessibility_identifier: [String, "You must set the accessibility_identifier to the title of the view. You can set the title of the view controller or of the navigation item."],
@@ -151,12 +151,12 @@ quiet: false,
 			},
 				UISwitch: {
 				accessibility_label: nil,
-				accessibility_traits: ->(t){A11y::Test.nonstandard(t, custom: UIAccessibilityTraitButton, message: "You can use :button.")},
+				accessibility_traits: :nonstandard,
 					accessibility_value: [String, "You must set the accessibility_value to \"1\" or \"0\""]
 			},
 				UITabBar: {
 				accessibility_label: nil,
-				accessibility_traits: ->(t){A11y::Test.nonstandard(t)},
+				accessibility_traits: :nonstandard,
 				should_group_accessibility_children: true,
 				is_accessibility_element: false,
 				options: {
@@ -166,7 +166,7 @@ quiet: false,
 			},
 				UITabBarButton: {
 				accessibility_label: [String, "You must set the title of this button. You can se tthe title of the UITabBarItem."],
-				accessibility_traits: ->(t){A11y::Test.nonstandard(t, apple: Bignum, custom: UIAccessibilityTraitButton, message: "You can use :button.")},
+				accessibility_traits: :nonstandard,
 			},
 				UITabBarController: {
 				accessibility_label: nil,
@@ -177,10 +177,10 @@ quiet: false,
 			}
 			},
 				UITableView: {
-				accessibility_label: [String, "You must set the accessibility_label to the default contents of the table view, for example \"Empty List\""],
-				accessibility_traits: ->(t){A11y::Test.nonstandard(t)},
+				accessibility_label: ->(t){table_label(t)},
+				accessibility_traits: :nonstandard,
 				should_group_accessibility_children: true,
-				is_accessibility_element: false
+				is_accessibility_element: ->(t){ table_is_element(t)}
 			},
 				UITableViewCell: {
 				accessibility_label: :ignore,
@@ -200,7 +200,7 @@ quiet: false,
 			},
 				UITableTextAccessibilityElement: {
 				accessibility_label: [String, "Set the accessibility_label to the text of the view."],
-				accessibility_traits: UIAccessibilityTraitStaticText,
+				accessibility_traits: :ignore,
 				accessibility_value: String,
 			},
 				UITableViewHeaderFooterView: {
@@ -208,19 +208,19 @@ quiet: false,
 			},
 				UITextField: {
 				accessibility_label: nil,
-				accessibility_traits: ->(t){A11y::Test.nonstandard(t, apple: Fixnum)},
+				accessibility_traits: :nonstandard,
 				accessibility_value: [:something, "You must set the text of the textfield."],
 				is_accessibility_element: false
 			},
 				UIAccessibilityTextFieldElement: {
 				accessibility_label: nil,
-				accessibility_traits: ->(t){A11y::Test.nonstandard(t, apple: Fixnum)},
+				accessibility_traits: :nonstandard,
 				accessibility_value: [:something, "You must set the text of the textfield."],
 				is_accessibility_element: true
 			},
 				UIToolbar: {
 				accessibility_label: nil,
-				accessibility_traits: ->(t){A11y::Test.nonstandard(t)},
+				accessibility_traits: :nonstandard,
 				should_group_accessibility_children: true,
 				is_accessibility_element:false,
 				options: {
@@ -260,6 +260,13 @@ quiet: false,
 				options: {
 				test: :window
 			}
+			},
+				:"RubyMotionQuery::App" => {
+				accessibility_label: nil,
+				is_accessibility_element: false,
+				options: {
+				test: :rmq_app
+			}
 			}
 			}
 
@@ -288,16 +295,17 @@ if UIDevice.currentDevice.systemVersion.to_f>=8.0
 				options: {recurse: false}
 			}
 				Tests[:UITableView] = {
-				accessibility_label: nil,
-				accessibility_traits: ->(t){A11y::Test.nonstandard(t)},
+				accessibility_label: ->(t){table_label(t)},
+				accessibility_traits: :nonstandard,
 				should_group_accessibility_children: true,
-				is_accessibility_element: false
+				is_accessibility_element: ->(t){table_is_element(t)}
 			}
 				Tests[:UITableViewCell] = {
 				accessibility_label: :ignore,
 				accessibility_value: :ignore,
 				should_group_accessibility_children: true,
 				is_accessibility_element: false,
+				accessibility_elements_hidden: :ignore,
 				options: {
 				recurse: false,
 				test: :tableViewCell
@@ -372,6 +380,36 @@ controller.viewControllers.each {|c| result=result&&self.run_tests(c)}
 result
 		end
 
+		def self.table_is_element(table)
+					if table.empty?
+						unless table.accessibility_element?
+							A11y::Test::Log.add(Path, "You must set is_accessibility_element to true for an empty table.")
+							return false
+						end
+					else
+						if table.accessibility_element?
+							A11y::Test::Log.add(Path, "You must set is_accessibility_element to false for a table with data.")
+							return false
+						end
+					end
+					true
+		end
+
+		def self.table_label(table)
+if table.empty?
+	unless table.accessibility_label.is_a?(String)
+		A11y::Test::Log.add(Path, "You must set the accessibility label to what you want VoiceOver to say instead of an empty table.")
+		return false
+	end
+else
+	unless table.accessibility_label.nil?
+		A11y::Test::Log.add(Path, "You must set the accessibility label to nil.")
+		return false
+	end
+end
+true
+		end
+
 		def self.tableViewCell(cell)
 			return true if cell.accessibility_label||cell.textLabel.text
 			A11y::Test::Log.add(Path, "Please set the accessibility_label of the UITableViewCell. You can do this by setting the textLabel.text property.")
@@ -386,8 +424,13 @@ result
 			self.run_tests(window.rootViewController)
 		end
 
+		def self.rmq_app(app)
+			self.run_tests(app.window)
+		end
+
 		def self.find_tests(obj)
 			return Tests[obj] if obj.kind_of?(Symbol)
+			return Tests[obj.to_s.to_sym] if obj.is_a?(Class)
 			obj_tests=A11y::Test::Tests[:NSObject].clone
 cl=obj.class
 class_name=cl.to_s.to_sym
@@ -412,6 +455,7 @@ obj_tests
 			return true if expected==:ignore
 	value=obj.send(attribute) if obj.respond_to?(attribute)
 	return value if expected==:something
+	return nonstandard(value) if expected==:nonstandard
 	result=true
 	if expected.class==Class
 if value.class!=expected
@@ -419,10 +463,9 @@ if value.class!=expected
 message||="#{attribute} must have an object of type #{expected} instead of #{value}"
 end
 	elsif expected.kind_of?(Proc)
-		r=expected.call(value)
+		r=expected.call(obj)
 		unless r
 			result=false
-			message||="The test function for #{attribute} failed."
 		end
 	else
 		unless expected==value
@@ -430,13 +473,14 @@ result=false
 message||="#{attribute} must have the value \"#{expected}\" instead of \"#{value}\""
 		end
 	end
-	A11y::Test::Log.add(Path, message) unless result
+	A11y::Test::Log.add(Path, message) if message&&!result
 	puts "Testing #{attribute}... #{result}" if Data[:debug]
 	result
 		end
 
 		def self.run_tests(obj)
 			puts "Entering run_tests: #{obj.inspect}" if Data[:debug]
+			return self.run_tests(obj.get) if defined?(RubyMotionQuery::RMQ)&&obj.is_a?(RubyMotionQuery::RMQ)
 			if Data[:depth]==0
 			A11y::Test::Log::Events.clear
 			Path.clear
@@ -510,3 +554,15 @@ result
 
 	end
 
+	class UITableView
+
+		def empty?
+			cells=0
+numberOfSections.times do |section|
+	cells+=numberOfRowsInSection(section)
+end
+cells==0
+		end
+
+	end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-accessibility
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Austin Seraphin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake